pidgin: 8c1a2905: Win32 build updates

[datallah at pidgin.im]

-----------------------------------------------------------------
Revision: 8c1a290531788673537514547c570bfa55648be7
Ancestor: b14ee507e932a395a0e1f29298af162c8614ca0f
Author: datallah at pidgin.im
Date: 2010-02-18T23:32:18
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/8c1a290531788673537514547c570bfa55648be7

Modified files:
        libpurple/Makefile.mingw
        libpurple/protocols/bonjour/Makefile.mingw
        libpurple/protocols/jabber/Makefile.mingw
        libpurple/win32/global.mak libpurple/win32/libc_interface.c
        libpurple/win32/libc_interface.h

ChangeLog: 

Win32 build updates

-------------- next part --------------
============================================================
--- libpurple/Makefile.mingw	4c9c0121a1531ad8fbc5e5caf8cd102fce9d9869
+++ libpurple/Makefile.mingw	c00779a8a36018e900636774f2d2e7fcfe2890a9
@@ -8,7 +8,7 @@ TARGET = libpurple
 include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
 
 TARGET = libpurple
-NEEDED_DLLS = $(LIBXML2_TOP)/bin/libxml2.dll
+NEEDED_DLLS = $(LIBXML2_TOP)/bin/libxml2-2.dll
 
 ##
 ## INCLUDE PATHS
@@ -20,7 +20,7 @@ INCLUDE_PATHS +=	\
 			-I$(GTK_TOP)/include \
 			-I$(GTK_TOP)/include/glib-2.0 \
 			-I$(GTK_TOP)/lib/glib-2.0/include \
-			-I$(LIBXML2_TOP)/include
+			-I$(LIBXML2_TOP)/include/libxml2
 
 LIB_PATHS +=		-L$(GTK_TOP)/lib \
 			-L$(LIBXML2_TOP)/lib
============================================================
--- libpurple/protocols/bonjour/Makefile.mingw	777e0daf0004d08a563a2d1d9dca1e6eeffe9e57
+++ libpurple/protocols/bonjour/Makefile.mingw	6a38b74549892ce23a732b9dd88b126b2b795e63
@@ -30,7 +30,7 @@ INCLUDE_PATHS +=	-I. \
 			-I$(GTK_TOP)/include/glib-2.0 \
 			-I$(GTK_TOP)/lib/glib-2.0/include \
 			-I$(BONJOUR_TOP)/Include \
-			-I$(LIBXML2_TOP)/include \
+			-I$(LIBXML2_TOP)/include/libxml2 \
 			-I$(PURPLE_TOP) \
 			-I$(PURPLE_TOP)/win32 \
 			-I$(PIDGIN_TREE_TOP)
============================================================
--- libpurple/protocols/jabber/Makefile.mingw	00e62b35a8ccc47eb70b71cd01b49ae2549eaea1
+++ libpurple/protocols/jabber/Makefile.mingw	7bb0e9cda528a26147ad515314a0f18cc66705f1
@@ -29,7 +29,7 @@ INCLUDE_PATHS +=	-I. \
 			-I$(GTK_TOP)/include \
 			-I$(GTK_TOP)/include/glib-2.0 \
 			-I$(GTK_TOP)/lib/glib-2.0/include \
-			-I$(LIBXML2_TOP)/include \
+			-I$(LIBXML2_TOP)/include/libxml2 \
 			-I$(PURPLE_TOP) \
 			-I$(PURPLE_TOP)/win32 \
 			-I$(PIDGIN_TREE_TOP)
============================================================
--- libpurple/win32/global.mak	89652372458d1232b799af249618b5c3987d252c
+++ libpurple/win32/global.mak	91b3ba14db0763e37db93eba3ae03434eafc898f
@@ -15,7 +15,7 @@ BONJOUR_TOP ?= $(WIN32_DEV_TOP)/Bonjour_
 GTK_TOP ?= $(WIN32_DEV_TOP)/gtk_2_0-2.14
 GTK_BIN ?= $(GTK_TOP)/bin
 BONJOUR_TOP ?= $(WIN32_DEV_TOP)/Bonjour_SDK
-LIBXML2_TOP ?= $(WIN32_DEV_TOP)/libxml2-2.6.30
+LIBXML2_TOP ?= $(WIN32_DEV_TOP)/libxml2-2.7.3
 MEANWHILE_TOP ?= $(WIN32_DEV_TOP)/meanwhile-1.0.2_daa2
 NSPR_TOP ?= $(WIN32_DEV_TOP)/nspr-4.6.4
 NSS_TOP ?= $(WIN32_DEV_TOP)/nss-3.11.4
============================================================
--- libpurple/win32/libc_interface.c	62618a2f7cab760c8aa7b62243e392bc13f6f140
+++ libpurple/win32/libc_interface.c	599b6612c198aa7ef0430df39d5ca2caa02242a3
@@ -33,6 +33,7 @@
 #include "libc_internal.h"
 #include <glib/gstdio.h>
 
+/** This is redefined here because we can't include internal.h */
 #ifdef ENABLE_NLS
 #  include <locale.h>
 #  include <libintl.h>
@@ -1047,29 +1048,12 @@ wpurple_get_timezone_abbreviation(const 
 	return "";
 }
 
+int wpurple_g_access (const gchar *filename, int mode);
 /**
- * g_access:
- * @filename: a pathname in the GLib file name encoding (UTF-8 on Windows)
- * @mode: as in access()
- *
- * A wrapper for the POSIX access() function. This function is used to
- * test a pathname for one or several of read, write or execute
- * permissions, or just existence. On Windows, the underlying access()
- * function in the C library only checks the READONLY attribute, and
- * does not look at the ACL at all. Software that needs to handle file
- * permissions on Windows more exactly should use the Win32 API.
- *
- * See the C library manual for more details about access().
- *
- * Returns: zero if the pathname refers to an existing file system
- * object that has all the tested permissions, or -1 otherwise or on
- * error.
- *
- * Since: 2.8
+ * @deprecated - remove for 3.0.0
  */
 int
-wpurple_g_access (const gchar *filename,
-	  int          mode)
+wpurple_g_access (const gchar *filename, int mode)
 {
 	return g_access(filename, mode);
 }
============================================================
--- libpurple/win32/libc_interface.h	2e18c8a46e679503205617530ac62cae1ef199d3
+++ libpurple/win32/libc_interface.h	ea23c9702eec172f10e3e17347b8bdea325e60a2
@@ -129,19 +129,14 @@ wpurple_gettimeofday( timeval, timezone 
 wpurple_gettimeofday( timeval, timezone )
 
 /* stdio.h */
+#undef snprintf
 #define snprintf _snprintf
+#undef vsnprintf
 #define vsnprintf _vsnprintf
 
 #define rename( oldname, newname ) \
 wpurple_rename( oldname, newname )
 
-#ifdef g_rename
-# undef g_rename
-#endif
-/* This is necessary because we want rename on win32 to be able to overwrite an existing file, it is done in internal.h if GLib < 2.6*/
-#define g_rename(oldname, newname) \
-wpurple_rename(oldname, newname)
-
 /* sys/stat.h */
 #define fchmod(a,b)