libxml2 r3681 - in trunk: . include win32

[rrichard svn gnome org]

Author: rrichard
Date: Fri Jan 25 19:03:37 2008
New Revision: 3681
URL: http://svn.gnome.org/viewvc/libxml2?rev=3681&view=rev

Log:
* include/win32config.h win32/Makefile.msvc: fix build under VS 2008.
  patch by David Wimsey

Modified:
   trunk/ChangeLog
   trunk/include/win32config.h
   trunk/win32/Makefile.msvc

Modified: trunk/include/win32config.h
==============================================================================
--- trunk/include/win32config.h	(original)
+++ trunk/include/win32config.h	Fri Jan 25 19:03:37 2008
@@ -92,7 +92,9 @@
 #if defined(_MSC_VER)
 #define mkdir(p,m) _mkdir(p)
 #define snprintf _snprintf
+#if _MSC_VER < 1500
 #define vsnprintf(b,c,f,a) _vsnprintf(b,c,f,a)
+#endif
 #elif defined(__MINGW32__)
 #define mkdir(p,m) _mkdir(p)
 #endif

Modified: trunk/win32/Makefile.msvc
==============================================================================
--- trunk/win32/Makefile.msvc	(original)
+++ trunk/win32/Makefile.msvc	Fri Jan 25 19:03:37 2008
@@ -66,7 +66,7 @@
 LDFLAGS = $(LDFLAGS) /LIBPATH:$(BINDIR) /LIBPATH:$(LIBPREFIX)
 LIBS =
 !if "$(WITH_FTP)" == "1" || "$(WITH_HTTP)" == "1"
-LIBS = $(LIBS) wsock32.lib
+LIBS = $(LIBS) wsock32.lib ws2_32.lib
 !endif 
 !if "$(WITH_ICONV)" == "1"
 LIBS = $(LIBS) iconv.lib