Blob Blame History Raw
diff -ru abiword-2.2.5.orig/wv/wvConfig.c abiword-2.2.5/wv/wvConfig.c
--- abiword-2.2.5.orig/wv/wvConfig.c	2005-03-04 08:48:33.804025324 +0000
+++ abiword-2.2.5/wv/wvConfig.c	2005-03-04 08:50:44.807202081 +0000
@@ -2130,7 +2130,7 @@
 }
 
 static void
-startElement (void *userData, const XML_Char *name, const XML_Char **atts)
+wvstartElement (void *userData, const XML_Char *name, const XML_Char **atts)
 {
     unsigned int nAtts = 0;
     const XML_Char **p;
@@ -3094,7 +3094,7 @@
 }
 
 static void
-endElement (void *userData, const XML_Char *name)
+wvendElement (void *userData, const XML_Char *name)
 {
     state_data *mydata = (state_data *) userData;
     unsigned int token_type;
@@ -3470,8 +3470,8 @@
 	memset(&hdl, 0, sizeof(hdl));
 
 	hdl.getEntity = _getEntity;
-	hdl.startElement = startElement;
-	hdl.endElement = endElement;
+	hdl.startElement = wvstartElement;
+	hdl.endElement = wvendElement;
 	hdl.characters = charData;
 
 	if (myhandle->fp)
@@ -3514,7 +3514,7 @@
     size_t len;
 
     XML_SetUserData (parser, myhandle);
-    XML_SetElementHandler (parser, startElement, endElement);
+    XML_SetElementHandler (parser, wvstartElement, wvendElement);
     XML_SetCharacterDataHandler (parser, charData);
 
     if (myhandle->fp == NULL)