/pidgin/main: fe350399078a: cross-win32: fix prpls

[Tomasz Wasilczyk]

Changeset: fe350399078a41f478308abb4600e4ba034e6f95
Author:	 Tomasz Wasilczyk <twasilczyk at pidgin.im>
Date:	 2014-04-15 21:20 +0200
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/fe350399078a

Description:

cross-win32: fix prpls

diffstat:

 configure.ac                                |  1 +
 libpurple/plugins/log_reader.c              |  5 -----
 libpurple/protocols/jabber/Makefile.am      |  4 ++++
 libpurple/protocols/jabber/iq.c             |  2 +-
 libpurple/protocols/mxit/mxit.h             |  1 -
 libpurple/protocols/oscar/family_icbm.c     |  4 ----
 libpurple/protocols/oscar/family_locate.c   |  3 ---
 libpurple/protocols/oscar/flap_connection.c |  4 ----
 libpurple/protocols/oscar/oscar.h           |  2 --
 libpurple/protocols/oscar/peer.c            |  4 ----
 libpurple/protocols/oscar/util.c            |  4 ----
 11 files changed, 6 insertions(+), 28 deletions(-)

diffs (144 lines):

diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -130,6 +130,7 @@ case "$host" in
 		is_win32="no"
 		;;
 esac
+AM_CONDITIONAL(IS_WIN32, test "x$is_win32" = "xyes")
 
 dnl Checks for header files.
 AC_HEADER_STDC
diff --git a/libpurple/plugins/log_reader.c b/libpurple/plugins/log_reader.c
--- a/libpurple/plugins/log_reader.c
+++ b/libpurple/plugins/log_reader.c
@@ -13,11 +13,6 @@
 #include "version.h"
 #include "xmlnode.h"
 
-/* This must be the last Purple header included. */
-#ifdef _WIN32
-#include "win32dep.h"
-#endif
-
 /* Where is the Windows partition mounted? */
 #ifndef PURPLE_LOG_READER_WINDOWS_MOUNT_POINT
 #define PURPLE_LOG_READER_WINDOWS_MOUNT_POINT "/mnt/windows"
diff --git a/libpurple/protocols/jabber/Makefile.am b/libpurple/protocols/jabber/Makefile.am
--- a/libpurple/protocols/jabber/Makefile.am
+++ b/libpurple/protocols/jabber/Makefile.am
@@ -101,6 +101,10 @@ if USE_CYRUS_SASL
 JABBERSOURCES += auth_cyrus.c
 endif
 
+if IS_WIN32
+JABBERSOURCES += win32/posix.uname.c
+endif
+
 if STATIC_JABBER
 
 st = -DPURPLE_STATIC_PRPL
diff --git a/libpurple/protocols/jabber/iq.c b/libpurple/protocols/jabber/iq.c
--- a/libpurple/protocols/jabber/iq.c
+++ b/libpurple/protocols/jabber/iq.c
@@ -43,7 +43,7 @@
 #include "ibb.h"
 
 #ifdef _WIN32
-#include "utsname.h"
+#include "win32/utsname.h"
 #endif
 
 static GHashTable *iq_handlers = NULL;
diff --git a/libpurple/protocols/mxit/mxit.h b/libpurple/protocols/mxit/mxit.h
--- a/libpurple/protocols/mxit/mxit.h
+++ b/libpurple/protocols/mxit/mxit.h
@@ -40,7 +40,6 @@
 #ifndef HOST_NAME_MAX
 #define		HOST_NAME_MAX				512
 #endif
-#include	"libc_interface.h"
 #elif defined( __linux__ )
 /* linux architecture */
 #include	<net/if.h>
diff --git a/libpurple/protocols/oscar/family_icbm.c b/libpurple/protocols/oscar/family_icbm.c
--- a/libpurple/protocols/oscar/family_icbm.c
+++ b/libpurple/protocols/oscar/family_icbm.c
@@ -48,10 +48,6 @@
 #include "oscar.h"
 #include "peer.h"
 
-#ifdef _WIN32
-#include "win32dep.h"
-#endif
-
 #include "util.h"
 
 static const char * const errcodereason[] = {
diff --git a/libpurple/protocols/oscar/family_locate.c b/libpurple/protocols/oscar/family_locate.c
--- a/libpurple/protocols/oscar/family_locate.c
+++ b/libpurple/protocols/oscar/family_locate.c
@@ -27,9 +27,6 @@
  */
 
 #include "oscar.h"
-#ifdef _WIN32
-#include "win32dep.h"
-#endif
 
 /* Define to log unknown TLVs */
 /* #define LOG_UNKNOWN_TLV */
diff --git a/libpurple/protocols/oscar/flap_connection.c b/libpurple/protocols/oscar/flap_connection.c
--- a/libpurple/protocols/oscar/flap_connection.c
+++ b/libpurple/protocols/oscar/flap_connection.c
@@ -29,10 +29,6 @@
 #include <netinet/in.h>
 #endif
 
-#ifdef _WIN32
-#include "win32dep.h"
-#endif
-
 /**
  * This sends a channel 1 SNAC containing the FLAP version.
  * The FLAP version is sent by itself at the beginning of every
diff --git a/libpurple/protocols/oscar/oscar.h b/libpurple/protocols/oscar/oscar.h
--- a/libpurple/protocols/oscar/oscar.h
+++ b/libpurple/protocols/oscar/oscar.h
@@ -52,8 +52,6 @@
 #include <netdb.h>
 #include <netinet/in.h>
 #include <sys/socket.h>
-#else
-#include "libc_interface.h"
 #endif
 
 typedef struct _ByteStream         ByteStream;
diff --git a/libpurple/protocols/oscar/peer.c b/libpurple/protocols/oscar/peer.c
--- a/libpurple/protocols/oscar/peer.c
+++ b/libpurple/protocols/oscar/peer.c
@@ -50,10 +50,6 @@
 #include <limits.h> /* for UINT_MAX */
 #endif
 
-#ifdef _WIN32
-#include "win32dep.h"
-#endif
-
 /*
  * I really want to switch all our networking code to using IPv6 only,
  * but that really isn't a good idea at all.  Evan S. of Adium says
diff --git a/libpurple/protocols/oscar/util.c b/libpurple/protocols/oscar/util.c
--- a/libpurple/protocols/oscar/util.c
+++ b/libpurple/protocols/oscar/util.c
@@ -31,10 +31,6 @@
 
 #include <ctype.h>
 
-#ifdef _WIN32
-#include "win32dep.h"
-#endif
-
 static const char * const msgerrreason[] = {
 	N_("Invalid error"),
 	N_("Invalid SNAC"),