[Expat-checkins] expat/xmlwf readfilemap.c, 1.13, 1.14 xmlfile.c, 1.18, 1.19

[Karl Waclawek]

Update of /cvsroot/expat/expat/xmlwf
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv27230/xmlwf

Modified Files:
	readfilemap.c xmlfile.c 
Log Message:
The Watcom compiler defines __LINUX__ and not __linux__ for cross compilation.

Index: readfilemap.c
===================================================================
RCS file: /cvsroot/expat/expat/xmlwf/readfilemap.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- readfilemap.c	5 Aug 2006 17:00:36 -0000	1.13
+++ readfilemap.c	5 Aug 2006 22:43:57 -0000	1.14
@@ -9,7 +9,7 @@
 #include <stdio.h>
 
 #ifdef __WATCOMC__
-#ifndef __linux__
+#ifndef __LINUX__
 #include <io.h>
 #else
 #include <unistd.h>

Index: xmlfile.c
===================================================================
RCS file: /cvsroot/expat/expat/xmlwf/xmlfile.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- xmlfile.c	5 Aug 2006 17:00:36 -0000	1.18
+++ xmlfile.c	5 Aug 2006 22:43:57 -0000	1.19
@@ -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>