commit edac3c9084a9b1814d4c4167238236460184cbe9
author Daniel Veillard <veillard@src.gnome.org> Mon Feb 26 01:36:19 2001 +0000
committer Daniel Veillard <veillard@src.gnome.org> Mon Feb 26 01:36:19 2001 +0000
tree 2d7e323162f530df820a146d7c60f3ea22d45405
parent 21a0f918527c4eda6b1e989280da48664edea262

- xinclude.c: fixed a problem building on Mac
Daniel

xinclude.c

diff --git a/xinclude.c b/xinclude.c
index 343eef7..3c20363 100644
--- a/xinclude.c
+++ b/xinclude.c
@@ -53,7 +53,7 @@
 /*
  * An XInclude context
  */
-typedef xmlChar *URL;
+typedef xmlChar *xmlURL;
 typedef struct _xmlXIncludeCtxt xmlXIncludeCtxt;
 typedef xmlXIncludeCtxt *xmlXIncludeCtxtPtr;
 struct _xmlXIncludeCtxt {
@@ -65,11 +65,11 @@
     int                 docNr; /* number of parsed documents */
     int                docMax; /* size of parsed documents tab */
     xmlDocPtr         *docTab; /* array of parsed documents */
-    URL               *urlTab; /* array of parsed documents URLs */
+    xmlURL            *urlTab; /* array of parsed documents URLs */
     int                 txtNr; /* number of unparsed documents */
     int                txtMax; /* size of unparsed documents tab */
     xmlNodePtr        *txtTab; /* array of unparsed text nodes */
-    URL            *txturlTab; /* array of unparsed txtuments URLs */
+    xmlURL         *txturlTab; /* array of unparsed txtuments URLs */
 };
 
 /**
@@ -129,7 +129,7 @@
  * Add a new document to the list
  */
 void
-xmlXIncludeAddDoc(xmlXIncludeCtxtPtr ctxt, xmlDocPtr doc, const URL url) {
+xmlXIncludeAddDoc(xmlXIncludeCtxtPtr ctxt, xmlDocPtr doc, const xmlURL url) {
     if (ctxt->docMax == 0) {
 	ctxt->docMax = 4;
         ctxt->docTab = (xmlDocPtr *) xmlMalloc(ctxt->docMax *
@@ -139,7 +139,7 @@
 		    "malloc failed !\n");
 	    return;
 	}
-        ctxt->urlTab = (URL *) xmlMalloc(ctxt->docMax *
+        ctxt->urlTab = (xmlURL *) xmlMalloc(ctxt->docMax *
 		                          sizeof(ctxt->urlTab[0]));
         if (ctxt->urlTab == NULL) {
 	    xmlGenericError(xmlGenericErrorContext,
@@ -156,7 +156,7 @@
 		    "realloc failed !\n");
 	    return;
 	}
-        ctxt->urlTab = (URL *) xmlRealloc(ctxt->urlTab,
+        ctxt->urlTab = (xmlURL *) xmlRealloc(ctxt->urlTab,
 	             ctxt->docMax * sizeof(ctxt->urlTab[0]));
         if (ctxt->urlTab == NULL) {
 	    xmlGenericError(xmlGenericErrorContext,
@@ -178,7 +178,7 @@
  * Add a new txtument to the list
  */
 void
-xmlXIncludeAddTxt(xmlXIncludeCtxtPtr ctxt, xmlNodePtr txt, const URL url) {
+xmlXIncludeAddTxt(xmlXIncludeCtxtPtr ctxt, xmlNodePtr txt, const xmlURL url) {
     if (ctxt->txtMax == 0) {
 	ctxt->txtMax = 4;
         ctxt->txtTab = (xmlNodePtr *) xmlMalloc(ctxt->txtMax *
@@ -188,7 +188,7 @@
 		    "malloc failed !\n");
 	    return;
 	}
-        ctxt->txturlTab = (URL *) xmlMalloc(ctxt->txtMax *
+        ctxt->txturlTab = (xmlURL *) xmlMalloc(ctxt->txtMax *
 		                          sizeof(ctxt->txturlTab[0]));
         if (ctxt->txturlTab == NULL) {
 	    xmlGenericError(xmlGenericErrorContext,
@@ -205,7 +205,7 @@
 		    "realloc failed !\n");
 	    return;
 	}
-        ctxt->txturlTab = (URL *) xmlRealloc(ctxt->txturlTab,
+        ctxt->txturlTab = (xmlURL *) xmlRealloc(ctxt->txturlTab,
 	             ctxt->txtMax * sizeof(ctxt->urlTab[0]));
         if (ctxt->txturlTab == NULL) {
 	    xmlGenericError(xmlGenericErrorContext,