Rename convert argument to conv to avoid problems when used

in perl extension.

diff --git a/expat/xmltok/xmltok.h b/expat/xmltok/xmltok.h
index dc0364a5031bd6f60f4ea07c49b6400e195713be..d87c8c67a14bb6884cf1b5c2ff65ddb72a851088 100755 (executable)
--- a/expat/xmltok/xmltok.h
+++ b/expat/xmltok/xmltok.h
@@ -270,7 +270,7 @@ int XMLTOKAPI XmlSizeOfUnknownEncoding();
 ENCODING XMLTOKAPI *
 XmlInitUnknownEncoding(void *mem,
                       int *table,
-                      int (*convert)(void *userData, const char *p),
+                      int (*conv)(void *userData, const char *p),
                       void *userData);
 
 int XMLTOKAPI XmlParseXmlDeclNS(int isGeneralTextEntity,
@@ -288,7 +288,7 @@ const ENCODING XMLTOKAPI *XmlGetUtf16InternalEncodingNS();
 ENCODING XMLTOKAPI *
 XmlInitUnknownEncodingNS(void *mem,
                         int *table,
-                        int (*convert)(void *userData, const char *p),
+                        int (*conv)(void *userData, const char *p),
                         void *userData);
 #ifdef __cplusplus
 }