/pidgin/main: 77efee65c5f4: cross-win32: fix socklen_t check, wi...

[Tomasz Wasilczyk]

Changeset: 77efee65c5f485715bc5ecaaa741d00ce66aa512
Author:	 Tomasz Wasilczyk <twasilczyk at pidgin.im>
Date:	 2014-04-15 03:36 +0200
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/77efee65c5f4

Description:

cross-win32: fix socklen_t check, win32dep.h include, undef pthread's localtime_r

diffstat:

 configure.ac                     |  6 +++++-
 libpurple/internal.h             |  2 +-
 libpurple/win32/libc_interface.h |  2 ++
 3 files changed, 8 insertions(+), 2 deletions(-)

diffs (40 lines):

diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -180,7 +180,11 @@ dnl Check for socklen_t (in Unix98)
 AC_MSG_CHECKING(for socklen_t)
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 	#include <sys/types.h>
-	#include <sys/socket.h>
+	#ifdef _WIN32
+	#  include <ws2tcpip.h>
+	#else
+	#  include <sys/socket.h>
+	#endif
 	socklen_t x;
 ]], [[]])], [
 	AC_MSG_RESULT(yes)
diff --git a/libpurple/internal.h b/libpurple/internal.h
--- a/libpurple/internal.h
+++ b/libpurple/internal.h
@@ -131,7 +131,7 @@
 #include <glib/gstdio.h>
 
 #ifdef _WIN32
-#include "win32dep.h"
+#include "win32/win32dep.h"
 #endif
 
 #ifdef HAVE_CONFIG_H
diff --git a/libpurple/win32/libc_interface.h b/libpurple/win32/libc_interface.h
--- a/libpurple/win32/libc_interface.h
+++ b/libpurple/win32/libc_interface.h
@@ -144,6 +144,8 @@ g_rename( oldname, newname )
 #define fchmod(a,b)
 
 /* time.h */
+/* XXX: it may be also defined by pthread.h */
+#undef localtime_r
 #define localtime_r( time, resultp ) \
 wpurple_localtime_r( time, resultp )