The Watcom compiler defines __LINUX__ and not __linux__ for cross compilation.

diff --git a/expat/xmlwf/readfilemap.c b/expat/xmlwf/readfilemap.c
index 170031eb69d808bee00f54e6756078488a82c341..088dda5c23dea74d54ffbac46127b99d3af43c66 100755 (executable)
--- a/expat/xmlwf/readfilemap.c
+++ b/expat/xmlwf/readfilemap.c
@@ -9,7 +9,7 @@
 #include <stdio.h>
 
 #ifdef __WATCOMC__
-#ifndef __linux__
+#ifndef __LINUX__
 #include <io.h>
 #else
 #include <unistd.h>

diff --git a/expat/xmlwf/xmlfile.c b/expat/xmlwf/xmlfile.c
index 5429491833b4333bb8a236df4782fa43940a841f..6c754463169671a19f5e0de7423e348f963c1065 100755 (executable)
--- a/expat/xmlwf/xmlfile.c
+++ b/expat/xmlwf/xmlfile.c
@@ -25,11 +25,9 @@
 #include "xmltchar.h"
 #include "filemap.h"
 
-#if (defined(_MSC_VER) || defined(__WATCOMC__))
-#ifndef __linux__
+#if (defined(_MSC_VER) || (defined(__WATCOMC__) && !defined(__LINUX__)))
 #include <io.h>
 #endif
-#endif
 
 #ifdef AMIGA_SHARED_LIB
 #include <proto/expat.h>