pidgin: 233fc9c7: Include winsock2.h before windows.h is i...

[datallah at pidgin.im]

-----------------------------------------------------------------
Revision: 233fc9c7bbb49b686ad5f5bd820a071c42f79591
Ancestor: 4e7c24fc3c65a5d148b580e3b8f90ac69f6f01e4
Author: datallah at pidgin.im
Date: 2008-04-25T15:48:33
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/233fc9c7bbb49b686ad5f5bd820a071c42f79591

Modified files:
        libpurple/win32/giowin32.c libpurple/win32/win32dep.c
        libpurple/win32/win32dep.h

ChangeLog: 

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.

-------------- next part --------------
============================================================
--- libpurple/win32/giowin32.c	42185fa57f801690e454a5f80b1da1975bb43384
+++ libpurple/win32/giowin32.c	86b6409b6946ca8f5c44259958c00102dc539926
@@ -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    *
   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;
============================================================
--- libpurple/win32/win32dep.c	9c65d295df837dbcb73c1ea5cd131d855ee82a0d
+++ libpurple/win32/win32dep.c	a4297cbe9ff27924ad30a282b30b36d08dcaf402
@@ -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
  */
============================================================
--- libpurple/win32/win32dep.h	8e66c33d321e2ce2181c62b77ac8e0376f487c81
+++ libpurple/win32/win32dep.h	81fc3253a893c4a7717d7b269be599d6cd6fd2c8
@@ -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"