Drop Open Watcom specific code (issues #14 and #21)

diff --git a/expat/lib/watcomconfig.h b/expat/lib/watcomconfig.h
deleted file mode 100644 (file)
index 2f05e3f..0000000
--- a/expat/lib/watcomconfig.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/* expat_config.h for use with Open Watcom 1.5 and above.  */
-
-#ifndef WATCOMCONFIG_H
-#define WATCOMCONFIG_H
-
-#ifdef __NT__
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#undef WIN32_LEAN_AND_MEAN
-#endif
-
-/* 1234 = LIL_ENDIAN, 4321 = BIGENDIAN */
-#define BYTEORDER 1234
-
-/* Define to 1 if you have the `memmove' function. */
-#define HAVE_MEMMOVE 1
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#define HAVE_UNISTD_H 1
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "expat-bugs@mail.libexpat.org"
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME "expat"
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "expat 2.0.0"
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION "2.0.0"
-
-/* Define to specify how much context to retain around the current parse
-   point. */
-#define XML_CONTEXT_BYTES 1024
-
-/* Define to make parameter entity parsing functionality available. */
-#define XML_DTD 1
-
-/* Define to make XML Namespaces functionality available. */
-#define XML_NS 1
-
-#endif
-

diff --git a/expat/lib/xmlparse.c b/expat/lib/xmlparse.c
index 2509652f92039c36c7308ffe59fe121e45b554eb..b62d789825c4565c55cfa851f05689a8099f3942 100644 (file)
--- a/expat/lib/xmlparse.c
+++ b/expat/lib/xmlparse.c
@@ -23,8 +23,6 @@
 #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 */

diff --git a/expat/lib/xmlrole.c b/expat/lib/xmlrole.c
index fcd0dc6948f442c9064ba670ed5f41867adf5690..cee05fc498e8e7f2e1fd88e9b2717f256f08ffdb 100644 (file)
--- a/expat/lib/xmlrole.c
+++ b/expat/lib/xmlrole.c
@@ -10,8 +10,6 @@
 #include "macconfig.h"
 #elif defined(__amigaos__)
 #include "amigaconfig.h"
-#elif defined(__WATCOMC__)
-#include "watcomconfig.h"
 #else
 #ifdef HAVE_EXPAT_CONFIG_H
 #include <expat_config.h>

diff --git a/expat/lib/xmltok.c b/expat/lib/xmltok.c
index 016cedb69078a479e105ac8dba5055a5ba6f8699..1a8b90e64b22531d054b481d348b2fde2b777f78 100644 (file)
--- a/expat/lib/xmltok.c
+++ b/expat/lib/xmltok.c
@@ -10,8 +10,6 @@
 #include "macconfig.h"
 #elif defined(__amigaos__)
 #include "amigaconfig.h"
-#elif defined(__WATCOMC__)
-#include "watcomconfig.h"
 #else
 #ifdef HAVE_EXPAT_CONFIG_H
 #include <expat_config.h>

diff --git a/expat/xmlwf/codepage.c b/expat/xmlwf/codepage.c
index 91bd15e96f8b85477be30a2060f53d228a61c144..f0049717ec3c05fc7f71124ea91d437300eff6fd 100644 (file)
--- a/expat/xmlwf/codepage.c
+++ b/expat/xmlwf/codepage.c
@@ -5,7 +5,7 @@
 #include "codepage.h"
 #include "internal.h"  /* for UNUSED_P only */
 
-#if (defined(WIN32) || (defined(__WATCOMC__) && defined(__NT__)))
+#if defined(WIN32)
 #define STRICT 1
 #define WIN32_LEAN_AND_MEAN 1
 

diff --git a/expat/xmlwf/readfilemap.c b/expat/xmlwf/readfilemap.c
index d816b263aae10e4a055ab090e50f4577b34306bb..143be497b8b27cfd93aecbae821dae690e2d3e4e 100644 (file)
--- a/expat/xmlwf/readfilemap.c
+++ b/expat/xmlwf/readfilemap.c
@@ -9,16 +9,8 @@
 #include <stdio.h>
 
 /* Functions close(2) and read(2) */
-#ifdef __WATCOMC__
-#ifndef __LINUX__
-#include <io.h>
-#else
-#include <unistd.h>
-#endif
-#else
-# if !defined(WIN32) && !defined(_WIN32) && !defined(_WIN64)
-#  include <unistd.h>
-# endif
+#if !defined(WIN32) && !defined(_WIN32) && !defined(_WIN64)
+# include <unistd.h>
 #endif
 
 #ifndef S_ISREG

diff --git a/expat/xmlwf/xmlfile.c b/expat/xmlwf/xmlfile.c
index 2f769aa894cf441a56e8c50688938fdefe959130..d67e341ab446c6133ae7e813affd2721d41e528c 100644 (file)
--- a/expat/xmlwf/xmlfile.c
+++ b/expat/xmlwf/xmlfile.c
@@ -14,8 +14,6 @@
 #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 */
@@ -26,7 +24,7 @@
 #include "xmltchar.h"
 #include "filemap.h"
 
-#if (defined(_MSC_VER) || (defined(__WATCOMC__) && !defined(__LINUX__)))
+#if defined(_MSC_VER)
 #include <io.h>
 #endif
 
@@ -88,7 +86,7 @@ processFile(const void *data, size_t size,
     *retPtr = 1;
 }
 
-#if (defined(WIN32) || defined(__WATCOMC__))
+#if defined(WIN32)
 
 static int
 isAsciiLetter(XML_Char c)
@@ -106,7 +104,7 @@ resolveSystemId(const XML_Char *base, const XML_Char *systemId,
   *toFree = 0;
   if (!base
       || *systemId == T('/')
-#if (defined(WIN32) || defined(__WATCOMC__))
+#if defined(WIN32)
       || *systemId == T('\\')
       || (isAsciiLetter(systemId[0]) && systemId[1] == T(':'))
 #endif
@@ -120,7 +118,7 @@ resolveSystemId(const XML_Char *base, const XML_Char *systemId,
   s = *toFree;
   if (tcsrchr(s, T('/')))
     s = tcsrchr(s, T('/')) + 1;
-#if (defined(WIN32) || defined(__WATCOMC__))
+#if defined(WIN32)
   if (tcsrchr(s, T('\\')))
     s = tcsrchr(s, T('\\')) + 1;
 #endif

diff --git a/expat/xmlwf/xmlwf.c b/expat/xmlwf/xmlwf.c
index 66d6c9ef4b71332219c2ad70e619da2d5bcce483..3c39fc8b0a2c1371c1a0821acc0cd7a86d921ce6 100644 (file)
--- a/expat/xmlwf/xmlwf.c
+++ b/expat/xmlwf/xmlwf.c
@@ -608,7 +608,7 @@ showVersion(XML_Char *prog)
   const XML_Feature *features = XML_GetFeatureList();
   while ((ch = *s) != 0) {
     if (ch == '/'
-#if (defined(WIN32) || defined(__WATCOMC__))
+#if defined(WIN32)
         || ch == '\\'
 #endif
         )
@@ -785,7 +785,7 @@ tmain(int argc, XML_Char **argv)
         const XML_Char * lastDelim = tcsrchr(file, delim[0]);
         if (lastDelim)
           file = lastDelim + 1;
-#if (defined(WIN32) || defined(__WATCOMC__))
+#if defined(WIN32)
         else {
           const XML_Char * winDelim = T("\\");
           lastDelim = tcsrchr(file, winDelim[0]);