# HG changeset patch
# User Daniel Atallah <daniel.atallah@gmail.com>
# Date 1209138513 0
# Node ID 1cd99421c69641cdb789a4a14fcea2b6a287ebce
# Parent  98fd7c994d683c7d1b2d7db78b743ced37cd4283
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.

diff -r 98fd7c994d68 -r 1cd99421c696 libpurple/win32/giowin32.c
--- a/libpurple/win32/giowin32.c	Fri Apr 25 15:37:21 2008 +0000
+++ b/libpurple/win32/giowin32.c	Fri Apr 25 15:48:33 2008 +0000
@@ -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_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 @@
   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 -r 98fd7c994d68 -r 1cd99421c696 libpurple/win32/win32dep.c
--- a/libpurple/win32/win32dep.c	Fri Apr 25 15:37:21 2008 +0000
+++ b/libpurple/win32/win32dep.c	Fri Apr 25 15:48:33 2008 +0000
@@ -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 -r 98fd7c994d68 -r 1cd99421c696 libpurple/win32/win32dep.h
--- a/libpurple/win32/win32dep.h	Fri Apr 25 15:37:21 2008 +0000
+++ b/libpurple/win32/win32dep.h	Fri Apr 25 15:48:33 2008 +0000
@@ -22,8 +22,9 @@
  */
 #ifndef _WIN32DEP_H_
 #define _WIN32DEP_H_
+#include <winsock2.h>
+#include <windows.h>
 #include <shlobj.h>
-#include <winsock2.h>
 #include <process.h>
 #include "wpurpleerror.h"
 #include "libc_interface.h"