From c2095e6b66a6e78cbe509a2ae9bf2ded12fddc8c Mon Sep 17 00:00:00 2001 From: James Clark Date: Tue, 6 Apr 1999 12:01:55 +0000 Subject: [PATCH] Rename convert argument to conv to avoid problems when used in perl extension. --- expat/xmltok/xmltok.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/expat/xmltok/xmltok.h b/expat/xmltok/xmltok.h index dc0364a5..d87c8c67 100755 --- 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 }