Mercurial > pidgin3 / changeset

--- a/libpurple/internal.h	Tue Mar 25 17:49:31 2014 -0400
+++ b/libpurple/internal.h	Wed Mar 26 03:01:13 2014 +0100
@@ -47,6 +47,9 @@
  */
 #ifdef ENABLE_NLS
 #  include <locale.h>
+#  ifndef __APPLE_CC__
+#    define __APPLE_CC__ 0
+#  endif
 #  include <libintl.h>
 #  define _(String) ((const char *)dgettext(PACKAGE, String))
 #  ifdef gettext_noop

--- a/libpurple/win32/wpurpleerror.h	Tue Mar 25 17:49:31 2014 -0400
+++ b/libpurple/win32/wpurpleerror.h	Wed Mar 26 03:01:13 2014 +0100
@@ -27,32 +27,57 @@
 
 /* Here we define unix socket errors as windows socket errors */
 
+#undef ENETDOWN
 #define ENETDOWN WSAENETDOWN
+#undef EAFNOSUPPORT
 #define EAFNOSUPPORT WSAEAFNOSUPPORT
+#undef EINPROGRESS
 #define EINPROGRESS WSAEINPROGRESS
+#undef ENOBUFS
 #define ENOBUFS WSAENOBUFS
+#undef EPROTONOSUPPORT
 #define EPROTONOSUPPORT WSAEPROTONOSUPPORT
+#undef EPROTOTYPE
 #define EPROTOTYPE WSAEPROTOTYPE
+#undef ESOCKTNOSUPPORT
 #define ESOCKTNOSUPPORT WSAESOCKTNOSUPPORT
 
+#undef EADDRINUSE
 #define EADDRINUSE WSAEADDRINUSE
+#undef EINPROGRESS
 #define EINPROGRESS WSAEINPROGRESS
+#undef EALREADY
 #define EALREADY WSAEALREADY
+#undef EADDRNOTAVAIL
 #define EADDRNOTAVAIL WSAEADDRNOTAVAIL
+#undef ECONNREFUSED
 #define ECONNREFUSED WSAECONNREFUSED
+#undef EISCONN
 #define EISCONN WSAEISCONN
+#undef ENETUNREACH
 #define ENETUNREACH WSAENETUNREACH
+#undef ENOTSOCK
 #define ENOTSOCK WSAENOTSOCK
+#undef ETIMEDOUT
 #define ETIMEDOUT WSAETIMEDOUT
+#undef EWOULDBLOCK
 #define EWOULDBLOCK WSAEWOULDBLOCK
 
+#undef ENOTCONN
 #define ENOTCONN WSAENOTCONN
+#undef ENETRESET
 #define ENETRESET WSAENETRESET
+#undef EOPNOTSUPP
 #define EOPNOTSUPP WSAEOPNOTSUPP
+#undef ESHUTDOWN
 #define ESHUTDOWN WSAESHUTDOWN
+#undef EMSGSIZE
 #define EMSGSIZE WSAEMSGSIZE
+#undef ECONNABORTED
 #define ECONNABORTED WSAECONNABORTED
+#undef ECONNRESET
 #define ECONNRESET WSAECONNRESET
+#undef EHOSTUNREACH
 #define EHOSTUNREACH WSAEHOSTUNREACH
 
 #endif /* end _WPURPLEERROR_H */