- nanoftp.c nanohttp.c uri.c include/win32config.h: Igor  Zlatkovic
  provided fixes to compile on MSCC again
- win32/libxml2/libxml2.def.src win32/libxml2/libxml2*.dsp: he
  also provided an update for the project files.
Daniel
diff --git a/include/win32config.h b/include/win32config.h
index 14c9e9e..5de4735 100644
--- a/include/win32config.h
+++ b/include/win32config.h
@@ -9,7 +9,7 @@
 #define LIBXML_DLL_IMPORT
 #define SOCKLEN_T int
 
-#ifdef INCLUDE_WINSOCK
+#ifdef NEED_SOCKETS
 #include <winsock2.h>
 
 #define EWOULDBLOCK             WSAEWOULDBLOCK
@@ -94,7 +94,10 @@
 /* Microsoft's C runtime names all non-ANSI functions with a leading
    underscore. Since functionality is still the same, they can be used. */
 #ifdef _MSC_VER
+#include <libxml/xmlversion.h>
+#ifndef WITH_TRIO
 #define snprintf _snprintf
 #define vsnprintf _vsnprintf
+#endif /* WITH_TRIO */
 #endif /* _MSC_VER */