Include winsock2.h before windows.h is included to avoid winsock.h being

included.  Also, rename and staticify a variable in our copy of giowin32.c
so it doesn't conflict with the one extern'ed in the glib headers.

3 files changed, 6 insertions, 16 deletions

diff --git a/libpurple/win32/giowin32.c b/libpurple/win32/giowin32.c
index 6aebad7cce..74e6b5afc2 100644
--- a/libpurple/win32/giowin32.c
+++ b/libpurple/win32/giowin32.c
@@ -37,8 +37,8 @@
 #include <glib.h>
 
 #include <stdlib.h>
+#include <winsock2.h>
 #include <windows.h>
-#include <winsock.h>          /* Not everybody has winsock2 */
 #include <fcntl.h>
 #include <io.h>
 #include <process.h>
@@ -541,7 +541,7 @@ g_io_win32_finalize (GSource *source)
   g_io_channel_unref (watch->channel);
 }
 
-GSourceFuncs g_io_watch_funcs = {
+static GSourceFuncs wp_g_io_watch_funcs = {
   g_io_win32_prepare,
   g_io_win32_check,
   g_io_win32_dispatch,
@@ -559,7 +559,7 @@ g_io_win32_create_watch (GIOChannel    *channel,
   GSource *source;
   char send_buffer[] = "c";
 
-  source = g_source_new (&g_io_watch_funcs, sizeof (GIOWin32Watch));
+  source = g_source_new (&wp_g_io_watch_funcs, sizeof (GIOWin32Watch));
   watch = (GIOWin32Watch *)source;
   
   watch->channel = channel;
diff --git a/libpurple/win32/win32dep.c b/libpurple/win32/win32dep.c
index 8d9f056461..5f07d6dc18 100644
--- a/libpurple/win32/win32dep.c
+++ b/libpurple/win32/win32dep.c
@@ -23,23 +23,12 @@
  *
  */
 #define _WIN32_IE 0x500
-#include <windows.h>
-#include <io.h>
-#include <stdlib.h>
-#include <stdio.h>
+#include "internal.h"
 #include <winuser.h>
 
-#include <glib.h>
-#include <glib/gstdio.h>
-
-#include "internal.h"
 #include "debug.h"
 #include "notify.h"
 
-#include <libintl.h>
-
-#include "win32dep.h"
-
 /*
  *  DEFINES & MACROS
  */
diff --git a/libpurple/win32/win32dep.h b/libpurple/win32/win32dep.h
index d4f6856c66..d13f99e9c7 100644
--- a/libpurple/win32/win32dep.h
+++ b/libpurple/win32/win32dep.h
@@ -22,8 +22,9 @@
  */
 #ifndef _WIN32DEP_H_
 #define _WIN32DEP_H_
-#include <shlobj.h>
 #include <winsock2.h>
+#include <windows.h>
+#include <shlobj.h>
 #include <process.h>
 #include "wpurpleerror.h"
 #include "libc_interface.h"