- 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

8 files changed, 77 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 28826842..e609495f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sat Jun  9 15:50:11 CEST 2001 Daniel Veillard <Daniel.Veillard@imag.fr>
+
+	* 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.
+
 Thu Jun  7 21:52:10 CEST 2001 Daniel Veillard <Daniel.Veillard@imag.fr>
 
 	* tree.c: applied Steve Tinney patch to xmlNewNsProp to fix
diff --git a/include/win32config.h b/include/win32config.h
index 14c9e9e6..5de47350 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 @@ static int isnan (double d) {
 /* 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 */
 
diff --git a/nanoftp.c b/nanoftp.c
index 050b8b08..69ff6bf0 100644
--- a/nanoftp.c
+++ b/nanoftp.c
@@ -20,6 +20,7 @@
 #include "trio.h"
 #endif
 #else /* STANDALONE */
+#define NEED_SOCKETS
 #include "libxml.h"
 #endif /* STANDALONE */
 
diff --git a/nanohttp.c b/nanohttp.c
index 31ed07c8..4991e0bb 100644
--- a/nanohttp.c
+++ b/nanohttp.c
@@ -14,6 +14,7 @@
 /* TODO add compression support, Send the Accept- , and decompress on the
         fly with ZLIB if found at compile-time */
 
+#define NEED_SOCKETS
 #include "libxml.h"
 
 #ifdef LIBXML_HTTP_ENABLED
diff --git a/uri.c b/uri.c
index b59ef035..09344794 100644
--- a/uri.c
+++ b/uri.c
@@ -10,10 +10,6 @@
 
 #include "libxml.h"
 
-#ifdef WIN32
-#define INCLUDE_WINSOCK
-#endif
-
 #include <string.h>
 
 #include <libxml/xmlmemory.h>
diff --git a/win32/libxml2/libxml2.def.src b/win32/libxml2/libxml2.def.src
index 39692930..4e4e50df 100644
--- a/win32/libxml2/libxml2.def.src
+++ b/win32/libxml2/libxml2.def.src
@@ -434,7 +434,6 @@ EXPORTS
 	cdataBlock
 	xmlDefaultSAXHandlerInit
 	htmlDefaultSAXHandlerInit
-	sgmlDefaultSAXHandlerInit
 
 /* 
  * strio.h 
@@ -911,3 +910,19 @@ EXPORTS
 	xmlXPtrEvalRangePredicate
 #endif /* LIBXML_XPTR_ENABLED */
 
+/*
+ * DOCBParser.h
+ */
+#ifdef LIBXML_DOCB_ENABLED
+	docbEncodeEntities
+	docbSAXParseDoc
+	docbParseDoc
+	docbSAXParseFile
+	docbParseFile
+	docbFreeParserCtxt
+	docbCreatePushParserCtxt
+	docbParseChunk
+	docbCreateFileParserCtxt
+	docbParseDocument
+#endif /* LIBXML_DOCB_ENABLED */
+
diff --git a/win32/libxml2/libxml2_a.dsp b/win32/libxml2/libxml2_a.dsp
index ceea6583..a42da4fc 100644
--- a/win32/libxml2/libxml2_a.dsp
+++ b/win32/libxml2/libxml2_a.dsp
@@ -89,10 +89,18 @@ LIB32=link.exe -lib
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

 # Begin Source File

 

+SOURCE=..\..\catalog.c

+# End Source File

+# Begin Source File

+

 SOURCE=..\..\debugXML.c

 # End Source File

 # Begin Source File

 

+SOURCE=..\..\DOCBparser.c

+# End Source File

+# Begin Source File

+

 SOURCE=..\..\encoding.c

 # End Source File

 # Begin Source File

@@ -185,10 +193,18 @@ SOURCE=..\..\xpointer.c
 # PROP Default_Filter "h;hpp;hxx;hm;inl"

 # Begin Source File

 

+SOURCE=..\..\include\libxml\catalog.h

+# End Source File

+# Begin Source File

+

 SOURCE=..\..\include\libxml\debugXML.h

 # End Source File

 # Begin Source File

 

+SOURCE=..\..\include\libxml\DOCBparser.h

+# End Source File

+# Begin Source File

+

 SOURCE=..\..\include\libxml\encoding.h

 # End Source File

 # Begin Source File

@@ -209,6 +225,10 @@ SOURCE=..\..\include\libxml\HTMLtree.h
 # End Source File

 # Begin Source File

 

+SOURCE=..\..\libxml.h

+# End Source File

+# Begin Source File

+

 SOURCE=..\..\include\libxml\list.h

 # End Source File

 # Begin Source File

diff --git a/win32/libxml2/libxml2_so.dsp b/win32/libxml2/libxml2_so.dsp
index 22ddd5ba..c6d6914c 100644
--- a/win32/libxml2/libxml2_so.dsp
+++ b/win32/libxml2/libxml2_so.dsp
@@ -94,10 +94,18 @@ LINK32=link.exe
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

 # Begin Source File

 

+SOURCE=..\..\catalog.c

+# End Source File

+# Begin Source File

+

 SOURCE=..\..\debugXML.c

 # End Source File

 # Begin Source File

 

+SOURCE=..\..\DOCBparser.c

+# End Source File

+# Begin Source File

+

 SOURCE=..\..\encoding.c

 # End Source File

 # Begin Source File

@@ -188,6 +196,10 @@ SOURCE=..\..\tree.c
 # End Source File

 # Begin Source File

 

+SOURCE=..\..\trio.c

+# End Source File

+# Begin Source File

+

 SOURCE=..\..\uri.c

 # End Source File

 # Begin Source File

@@ -224,10 +236,18 @@ SOURCE=..\..\xpointer.c
 # PROP Default_Filter "h;hpp;hxx;hm;inl"

 # Begin Source File

 

+SOURCE=..\..\include\libxml\catalog.h

+# End Source File

+# Begin Source File

+

 SOURCE=..\..\include\libxml\debugXML.h

 # End Source File

 # Begin Source File

 

+SOURCE=..\..\include\libxml\DOCBparser.h

+# End Source File

+# Begin Source File

+

 SOURCE=..\..\include\libxml\encoding.h

 # End Source File

 # Begin Source File

@@ -248,6 +268,10 @@ SOURCE=..\..\include\libxml\HTMLtree.h
 # End Source File

 # Begin Source File

 

+SOURCE=..\..\libxml.h

+# End Source File

+# Begin Source File

+

 SOURCE=..\..\include\libxml\list.h

 # End Source File

 # Begin Source File

@@ -280,6 +304,10 @@ SOURCE=..\..\include\libxml\tree.h
 # End Source File

 # Begin Source File

 

+SOURCE=..\..\trio.h

+# End Source File

+# Begin Source File

+

 SOURCE=..\..\include\libxml\uri.h

 # End Source File

 # Begin Source File