/pidgin/main: c7a49364ce5f: Fix load of warnings on win32

[Tomasz Wasilczyk]

Changeset: c7a49364ce5f6f236f8a928dde49083ad7ee8264
Author:	 Tomasz Wasilczyk <twasilczyk at pidgin.im>
Date:	 2014-03-26 03:01 +0100
Branch:	 release-2.x.y
URL: https://hg.pidgin.im/pidgin/main/rev/c7a49364ce5f

Description:

Fix load of warnings on win32

diffstat:

 libpurple/internal.h           |   3 +++
 libpurple/win32/wpurpleerror.h |  25 +++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 0 deletions(-)

diffs (74 lines):

diff --git a/libpurple/internal.h b/libpurple/internal.h
--- a/libpurple/internal.h
+++ b/libpurple/internal.h
@@ -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
diff --git a/libpurple/win32/wpurpleerror.h b/libpurple/win32/wpurpleerror.h
--- a/libpurple/win32/wpurpleerror.h
+++ b/libpurple/win32/wpurpleerror.h
@@ -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 */