commit 5bb9ccd56a812b65e94e71477389be7826203649
author Daniel Veillard <veillard@src.gnome.org> Mon Feb 09 12:39:02 2004 +0000
committer Daniel Veillard <veillard@src.gnome.org> Mon Feb 09 12:39:02 2004 +0000
tree 4468e71d77ecf04987688ac265b52b16be3800fb
parent 95af594b0bd28ad8847de96ec00ff9244bd94da7

remove the warning on the 2001 namespace remove some warnings when

* xinclude.c: remove the warning on the 2001 namespace
* parser.c parserInternals.c xpath.c: remove some warnings
  when compiling with MSVC6
* nanohttp.c: applied a patch when using _WINSOCKAPI_
Daniel

ChangeLog

diff --git a/ChangeLog b/ChangeLog
index b9f04d6..80c0bfa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Mon Feb  9 13:35:50 CET 2004 Daniel Veillard <daniel@veillard.com>
+
+	* xinclude.c: remove the warning on the 2001 namespace
+	* parser.c parserInternals.c xpath.c: remove some warnings
+	  when compiling with MSVC6
+	* nanohttp.c: applied a patch when using _WINSOCKAPI_
+
 Sun Feb  8 12:09:55 HKT 2004 William Brack <wbrack@mmm.com.hk>
 
 	* xinclude.c: added a small hack to fix interference between

nanohttp.c

diff --git a/nanohttp.c b/nanohttp.c
index 673b893..e43c37b 100644
--- a/nanohttp.c
+++ b/nanohttp.c
@@ -872,6 +872,9 @@
 xmlNanoHTTPConnectAttempt(struct sockaddr *addr)
 {
     fd_set wfd;
+#ifdef _WINSOCKAPI_
+    fd_set xfd;
+#endif
     struct timeval tv;
     int status;
     int addrlen;
@@ -954,8 +957,15 @@
     
     FD_ZERO(&wfd);
     FD_SET(s, &wfd);
+
+#ifdef _WINSOCKAPI_    
+    FD_ZERO(&xfd);
+    FD_SET(s, &xfd);
     
+    switch(select(s+1, NULL, &wfd, &xfd, &tv))
+#else
     switch(select(s+1, NULL, &wfd, NULL, &tv))
+#endif
     {
 	case 0:
 	    /* Time out */
@@ -969,7 +979,11 @@
 	    return(-1);
     }
 
-    if ( FD_ISSET(s, &wfd) ) {
+    if ( FD_ISSET(s, &wfd)
+#ifdef _WINSOCKAPI_
+                           || FD_ISSET(s, &xfd)
+#endif
+                                                ) {
 	SOCKLEN_T len;
 	len = sizeof(status);
 #ifdef SO_ERROR

parser.c

diff --git a/parser.c b/parser.c
index fddd21f..d8b7f3b 100644
--- a/parser.c
+++ b/parser.c
@@ -854,7 +854,7 @@
     } else if (ctxt->nsNr >= ctxt->nsMax) {
         ctxt->nsMax *= 2;
         ctxt->nsTab = (const xmlChar **)
-	              xmlRealloc(ctxt->nsTab,
+	              xmlRealloc((char *) ctxt->nsTab,
 				 ctxt->nsMax * sizeof(ctxt->nsTab[0]));
         if (ctxt->nsTab == NULL) {
             xmlErrMemory(ctxt, NULL);

parserInternals.c

diff --git a/parserInternals.c b/parserInternals.c
index 67fbd63..b6601d3 100644
--- a/parserInternals.c
+++ b/parserInternals.c
@@ -1686,7 +1686,7 @@
     if (ctxt->vctxt.nodeTab != NULL) xmlFree(ctxt->vctxt.nodeTab);
     if (ctxt->atts != NULL) xmlFree((xmlChar * *)ctxt->atts);
     if (ctxt->dict != NULL) xmlDictFree(ctxt->dict);
-    if (ctxt->nsTab != NULL) xmlFree(ctxt->nsTab);
+    if (ctxt->nsTab != NULL) xmlFree((char *) ctxt->nsTab);
     if (ctxt->pushTab != NULL) xmlFree(ctxt->pushTab);
     if (ctxt->attallocs != NULL) xmlFree(ctxt->attallocs);
     if (ctxt->attsDefault != NULL) 

xinclude.c

diff --git a/xinclude.c b/xinclude.c
index a58a779..4cd762f 100644
--- a/xinclude.c
+++ b/xinclude.c
@@ -2076,9 +2076,11 @@
         (xmlStrEqual(node->ns->href, XINCLUDE_OLD_NS))) {
 	if (xmlStrEqual(node->ns->href, XINCLUDE_OLD_NS)) {
 	    if (ctxt->legacy == 0) {
+#if 0 /* wait for the XML Core Working Group to get something stable ! */
 		xmlXIncludeWarn(ctxt, node, XML_XINCLUDE_DEPRECATED_NS,
 	               "Deprecated XInclude namespace found, use %s",
 		                XINCLUDE_NS);
+#endif
 	        ctxt->legacy = 1;
 	    }
 	}

xpath.c

diff --git a/xpath.c b/xpath.c
index c42e009..9bf5571 100644
--- a/xpath.c
+++ b/xpath.c
@@ -8795,7 +8795,9 @@
 	    xmlGenericErrorContextNodeSet(stdout, ctxt->value->nodesetval);
 #endif
 
+#ifdef LIBXML_XPTR_ENABLED
 eval_predicates:
+#endif
 	op1 = ctxt->comp->last;
 	ctxt->comp->last = -1;