diff libpurple/win32/giowin32.c @ 22726:1cd99421c696

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.

--- 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;