Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/external/mit/expat/dist/xmlwf/xmlfile.c,v
rcsdiff: /ftp/cvs/cvsroot/src/external/mit/expat/dist/xmlwf/xmlfile.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.1.1.1.16.2
retrieving revision 1.1.1.2
diff -u -p -r1.1.1.1.16.2 -r1.1.1.2
--- src/external/mit/expat/dist/xmlwf/xmlfile.c	2017/06/21 16:46:23	1.1.1.1.16.2
+++ src/external/mit/expat/dist/xmlwf/xmlfile.c	2017/02/04 10:15:57	1.1.1.2
@@ -8,11 +8,17 @@
 #include <string.h>
 #include <fcntl.h>
 
-#ifdef _WIN32
+#ifdef WIN32
 #include "winconfig.h"
+#elif defined(MACOS_CLASSIC)
+#include "macconfig.h"
+#elif defined(__amigaos__)
+#include "amigaconfig.h"
+#elif defined(__WATCOMC__)
+#include "watcomconfig.h"
 #elif defined(HAVE_EXPAT_CONFIG_H)
 #include <expat_config.h>
-#endif /* ndef _WIN32 */
+#endif /* ndef WIN32 */
 
 #include "expat.h"
 #include "internal.h"  /* for UNUSED_P only */
@@ -20,10 +26,14 @@
 #include "xmltchar.h"
 #include "filemap.h"
 
-#if defined(_MSC_VER)
+#if (defined(_MSC_VER) || (defined(__WATCOMC__) && !defined(__LINUX__)))
 #include <io.h>
 #endif
 
+#if defined(__amigaos__) && defined(__USE_INLINE__)
+#include <proto/expat.h>
+#endif
+
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
@@ -48,9 +58,6 @@ typedef struct {
   int *retPtr;
 } PROCESS_ARGS;
 
-static int
-processStream(const XML_Char *filename, XML_Parser parser);
-
 static void
 reportError(XML_Parser parser, const XML_Char *filename)
 {
@@ -81,7 +88,7 @@ processFile(const void *data, size_t siz
     *retPtr = 1;
 }
 
-#if defined(_WIN32)
+#if (defined(WIN32) || defined(__WATCOMC__))
 
 static int
 isAsciiLetter(XML_Char c)
@@ -89,7 +96,7 @@ isAsciiLetter(XML_Char c)
   return (T('a') <= c && c <= T('z')) || (T('A') <= c && c <= T('Z'));
 }
 
-#endif /* _WIN32 */
+#endif /* WIN32 */
 
 static const XML_Char *
 resolveSystemId(const XML_Char *base, const XML_Char *systemId,
@@ -99,7 +106,7 @@ resolveSystemId(const XML_Char *base, co
   *toFree = 0;
   if (!base
       || *systemId == T('/')
-#if defined(_WIN32)
+#if (defined(WIN32) || defined(__WATCOMC__))
       || *systemId == T('\\')
       || (isAsciiLetter(systemId[0]) && systemId[1] == T(':'))
 #endif
@@ -113,7 +120,7 @@ resolveSystemId(const XML_Char *base, co
   s = *toFree;
   if (tcsrchr(s, T('/')))
     s = tcsrchr(s, T('/')) + 1;
-#if defined(_WIN32)
+#if (defined(WIN32) || defined(__WATCOMC__))
   if (tcsrchr(s, T('\\')))
     s = tcsrchr(s, T('\\')) + 1;
 #endif
@@ -132,23 +139,13 @@ externalEntityRefFilemap(XML_Parser pars
   XML_Char *s;
   const XML_Char *filename;
   XML_Parser entParser = XML_ExternalEntityParserCreate(parser, context, 0);
-  int filemapRes;
   PROCESS_ARGS args;
   args.retPtr = &result;
   args.parser = entParser;
   filename = resolveSystemId(base, systemId, &s);
   XML_SetBase(entParser, filename);
-  filemapRes = filemap(filename, processFile, &args);
-  switch (filemapRes) {
-  case 0:
+  if (!filemap(filename, processFile, &args))
     result = 0;
-    break;
-  case 2:
-    ftprintf(stderr, T("%s: file too large for memory-mapping")
-        T(", switching to streaming\n"), filename);
-    result = processStream(filename, entParser);
-    break;
-  }
   free(s);
   XML_ParserFree(entParser);
   return result;
@@ -236,21 +233,11 @@ XML_ProcessFile(XML_Parser parser,
                                       ? externalEntityRefFilemap
                                       : externalEntityRefStream);
   if (flags & XML_MAP_FILE) {
-    int filemapRes;
     PROCESS_ARGS args;
     args.retPtr = &result;
     args.parser = parser;
-    filemapRes = filemap(filename, processFile, &args);
-    switch (filemapRes) {
-    case 0:
+    if (!filemap(filename, processFile, &args))
       result = 0;
-      break;
-    case 2:
-      ftprintf(stderr, T("%s: file too large for memory-mapping")
-          T(", switching to streaming\n"), filename);
-      result = processStream(filename, parser);
-      break;
-    }
   }
   else
     result = processStream(filename, parser);