Added type casts necessary for compiling as C++ file (at least under VC++).

diff --git a/expat/xmlwf/xmlfile.c b/expat/xmlwf/xmlfile.c
index 6cb071533c05bdcafc365336ed8fa039e946cfef..32c6488d78f9827e9c4daa6962aba3687ee9d4fa 100755 (executable)
--- a/expat/xmlwf/xmlfile.c
+++ b/expat/xmlwf/xmlfile.c
@@ -50,7 +50,7 @@ typedef struct {
 static void
 reportError(XML_Parser parser, const XML_Char *filename)
 {
-  int code = XML_GetErrorCode(parser);
+  enum XML_Error code = XML_GetErrorCode(parser);
   const XML_Char *message = XML_ErrorString(code);
   if (message)
     ftprintf(stdout, T("%s:%d:%d: %s\n"),
@@ -68,7 +68,7 @@ processFile(const void *data, size_t size,
 {
   XML_Parser parser = ((PROCESS_ARGS *)args)->parser;
   int *retPtr = ((PROCESS_ARGS *)args)->retPtr;
-  if (XML_Parse(parser, data, size, 1) == XML_STATUS_ERROR) {
+  if (XML_Parse(parser, (const char *)data, size, 1) == XML_STATUS_ERROR) {
     reportError(parser, filename);
     *retPtr = 0;
   }
@@ -154,7 +154,7 @@ processStream(const XML_Char *filename, XML_Parser parser)
   }
   for (;;) {
     int nread;
-    char *buf = XML_GetBuffer(parser, READ_SIZE);
+    char *buf = (char *)XML_GetBuffer(parser, READ_SIZE);
     if (!buf) {
       if (filename != NULL)
         close(fd);

diff --git a/expat/xmlwf/xmlwf.c b/expat/xmlwf/xmlwf.c
index 94798753b7b9e00478af6a881b3e56cb0b0e980a..eae180e746e72f88c9ac1476b8f51321e02e687e 100755 (executable)
--- a/expat/xmlwf/xmlwf.c
+++ b/expat/xmlwf/xmlwf.c
@@ -23,7 +23,7 @@
 static void XMLCALL
 characterData(void *userData, const XML_Char *s, int len)
 {
-  FILE *fp = userData;
+  FILE *fp = (FILE *)userData;
   for (; len > 0; --len, ++s) {
     switch (*s) {
     case T('&'):
@@ -118,7 +118,7 @@ startElement(void *userData, const XML_Char *name, const XML_Char **atts)
 {
   int nAtts;
   const XML_Char **p;
-  FILE *fp = userData;
+  FILE *fp = (FILE *)userData;
   puttc(T('<'), fp);
   fputts(name, fp);
 
@@ -140,7 +140,7 @@ startElement(void *userData, const XML_Char *name, const XML_Char **atts)
 static void XMLCALL
 endElement(void *userData, const XML_Char *name)
 {
-  FILE *fp = userData;
+  FILE *fp = (FILE *)userData;
   puttc(T('<'), fp);
   puttc(T('/'), fp);
   fputts(name, fp);
@@ -165,7 +165,7 @@ startElementNS(void *userData, const XML_Char *name, const XML_Char **atts)
   int nAtts;
   int nsi;
   const XML_Char **p;
-  FILE *fp = userData;
+  FILE *fp = (FILE *)userData;
   const XML_Char *sep;
   puttc(T('<'), fp);
 
@@ -211,7 +211,7 @@ startElementNS(void *userData, const XML_Char *name, const XML_Char **atts)
 static void XMLCALL
 endElementNS(void *userData, const XML_Char *name)
 {
-  FILE *fp = userData;
+  FILE *fp = (FILE *)userData;
   const XML_Char *sep;
   puttc(T('<'), fp);
   puttc(T('/'), fp);
@@ -231,7 +231,7 @@ static void XMLCALL
 processingInstruction(void *userData, const XML_Char *target,
                       const XML_Char *data)
 {
-  FILE *fp = userData;
+  FILE *fp = (FILE *)userData;
   puttc(T('<'), fp);
   puttc(T('?'), fp);
   fputts(target, fp);
@@ -293,7 +293,7 @@ nopProcessingInstruction(void *userData, const XML_Char *target,
 static void XMLCALL
 markup(void *userData, const XML_Char *s, int len)
 {
-  FILE *fp = XML_GetUserData((XML_Parser) userData);
+  FILE *fp = (FILE *)XML_GetUserData((XML_Parser) userData);
   for (; len > 0; --len, ++s)
     puttc(*s, fp);
 }
@@ -303,8 +303,8 @@ metaLocation(XML_Parser parser)
 {
   const XML_Char *uri = XML_GetBase(parser);
   if (uri)
-    ftprintf(XML_GetUserData(parser), T(" uri=\"%s\""), uri);
-  ftprintf(XML_GetUserData(parser),
+    ftprintf((FILE *)XML_GetUserData(parser), T(" uri=\"%s\""), uri);
+  ftprintf((FILE *)XML_GetUserData(parser),
            T(" byte=\"%ld\" nbytes=\"%d\" line=\"%d\" col=\"%d\""),
            XML_GetCurrentByteIndex(parser),
            XML_GetCurrentByteCount(parser),
@@ -315,13 +315,13 @@ metaLocation(XML_Parser parser)
 static void
 metaStartDocument(void *userData)
 {
-  fputts(T("<document>\n"), XML_GetUserData((XML_Parser) userData));
+  fputts(T("<document>\n"), (FILE *)XML_GetUserData((XML_Parser) userData));
 }
 
 static void
 metaEndDocument(void *userData)
 {
-  fputts(T("</document>\n"), XML_GetUserData((XML_Parser) userData));
+  fputts(T("</document>\n"), (FILE *)XML_GetUserData((XML_Parser) userData));
 }
 
 static void XMLCALL
@@ -329,7 +329,7 @@ metaStartElement(void *userData, const XML_Char *name,
                  const XML_Char **atts)
 {
   XML_Parser parser = (XML_Parser) userData;
-  FILE *fp = XML_GetUserData(parser);
+  FILE *fp = (FILE *)XML_GetUserData(parser);
   const XML_Char **specifiedAttsEnd
     = atts + XML_GetSpecifiedAttributeCount(parser);
   const XML_Char **idAttPtr;
@@ -363,7 +363,7 @@ static void XMLCALL
 metaEndElement(void *userData, const XML_Char *name)
 {
   XML_Parser parser = (XML_Parser) userData;
-  FILE *fp = XML_GetUserData(parser);
+  FILE *fp = (FILE *)XML_GetUserData(parser);
   ftprintf(fp, T("<endtag name=\"%s\""), name);
   metaLocation(parser);
   fputts(T("/>\n"), fp);
@@ -374,7 +374,7 @@ metaProcessingInstruction(void *userData, const XML_Char *target,
                           const XML_Char *data)
 {
   XML_Parser parser = (XML_Parser) userData;
-  FILE *fp = XML_GetUserData(parser);
+  FILE *fp = (FILE *)XML_GetUserData(parser);
   ftprintf(fp, T("<pi target=\"%s\" data=\""), target);
   characterData(fp, data, tcslen(data));
   puttc(T('"'), fp);
@@ -386,7 +386,7 @@ static void XMLCALL
 metaComment(void *userData, const XML_Char *data)
 {
   XML_Parser parser = (XML_Parser) userData;
-  FILE *fp = XML_GetUserData(parser);
+  FILE *fp = (FILE *)XML_GetUserData(parser);
   fputts(T("<comment data=\""), fp);
   characterData(fp, data, tcslen(data));
   puttc(T('"'), fp);
@@ -398,7 +398,7 @@ static void XMLCALL
 metaStartCdataSection(void *userData)
 {
   XML_Parser parser = (XML_Parser) userData;
-  FILE *fp = XML_GetUserData(parser);
+  FILE *fp = (FILE *)XML_GetUserData(parser);
   fputts(T("<startcdata"), fp);
   metaLocation(parser);
   fputts(T("/>\n"), fp);
@@ -408,7 +408,7 @@ static void XMLCALL
 metaEndCdataSection(void *userData)
 {
   XML_Parser parser = (XML_Parser) userData;
-  FILE *fp = XML_GetUserData(parser);
+  FILE *fp = (FILE *)XML_GetUserData(parser);
   fputts(T("<endcdata"), fp);
   metaLocation(parser);
   fputts(T("/>\n"), fp);
@@ -418,7 +418,7 @@ static void XMLCALL
 metaCharacterData(void *userData, const XML_Char *s, int len)
 {
   XML_Parser parser = (XML_Parser) userData;
-  FILE *fp = XML_GetUserData(parser);
+  FILE *fp = (FILE *)XML_GetUserData(parser);
   fputts(T("<chars str=\""), fp);
   characterData(fp, s, len);
   puttc(T('"'), fp);
@@ -434,7 +434,7 @@ metaStartDoctypeDecl(void *userData,
                      int has_internal_subset)
 {
   XML_Parser parser = (XML_Parser) userData;
-  FILE *fp = XML_GetUserData(parser);
+  FILE *fp = (FILE *)XML_GetUserData(parser);
   ftprintf(fp, T("<startdoctype name=\"%s\""), doctypeName);
   metaLocation(parser);
   fputts(T("/>\n"), fp);
@@ -444,7 +444,7 @@ static void XMLCALL
 metaEndDoctypeDecl(void *userData)
 {
   XML_Parser parser = (XML_Parser) userData;
-  FILE *fp = XML_GetUserData(parser);
+  FILE *fp = (FILE *)XML_GetUserData(parser);
   fputts(T("<enddoctype"), fp);
   metaLocation(parser);
   fputts(T("/>\n"), fp);
@@ -458,7 +458,7 @@ metaNotationDecl(void *userData,
                  const XML_Char *publicId)
 {
   XML_Parser parser = (XML_Parser) userData;
-  FILE *fp = XML_GetUserData(parser);
+  FILE *fp = (FILE *)XML_GetUserData(parser);
   ftprintf(fp, T("<notation name=\"%s\""), notationName);
   if (publicId)
     ftprintf(fp, T(" public=\"%s\""), publicId);
@@ -484,7 +484,7 @@ metaEntityDecl(void *userData,
                const XML_Char *notationName)
 {
   XML_Parser parser = (XML_Parser) userData;
-  FILE *fp = XML_GetUserData(parser);
+  FILE *fp = (FILE *)XML_GetUserData(parser);
 
   if (value) {
     ftprintf(fp, T("<entity name=\"%s\""), entityName);
@@ -522,7 +522,7 @@ metaStartNamespaceDecl(void *userData,
                        const XML_Char *uri)
 {
   XML_Parser parser = (XML_Parser) userData;
-  FILE *fp = XML_GetUserData(parser);
+  FILE *fp = (FILE *)XML_GetUserData(parser);
   fputts(T("<startns"), fp);
   if (prefix)
     ftprintf(fp, T(" prefix=\"%s\""), prefix);
@@ -539,7 +539,7 @@ static void XMLCALL
 metaEndNamespaceDecl(void *userData, const XML_Char *prefix)
 {
   XML_Parser parser = (XML_Parser) userData;
-  FILE *fp = XML_GetUserData(parser);
+  FILE *fp = (FILE *)XML_GetUserData(parser);
   if (!prefix)
     fputts(T("<endns/>\n"), fp);
   else
@@ -645,7 +645,8 @@ tmain(int argc, XML_Char **argv)
   int outputType = 0;
   int useNamespaces = 0;
   int requireStandalone = 0;
-  int paramEntityParsing = XML_PARAM_ENTITY_PARSING_NEVER;
+  enum XML_ParamEntityParsing paramEntityParsing = 
+    XML_PARAM_ENTITY_PARSING_NEVER;
   int useStdin = 0;
 
 #ifdef _MSC_VER
@@ -773,7 +774,7 @@ tmain(int argc, XML_Char **argv)
       if (tcsrchr(file, T('\\')))
         file = tcsrchr(file, T('\\')) + 1;
 #endif
-      outName = malloc((tcslen(outputDir) + tcslen(file) + 2)
+      outName = (XML_Char *)malloc((tcslen(outputDir) + tcslen(file) + 2)
                        * sizeof(XML_Char));
       tcscpy(outName, outputDir);
       tcscat(outName, T("/"));