diff options
author | 2015-01-10 12:03:05 +0100 | |
---|---|---|
committer | 2015-01-10 12:03:05 +0100 | |
commit | 67e5785c2fa3892cb41caefdc10aaf947ed0c5db (patch) | |
tree | ae558c6c63e3461be24d93ab8c98290a6f8ac510 /3rdparty/expat/lib | |
parent | 2c9a5344f38aa3f867a56f8ed87b2c99b77c858a (diff) |
Applied expat changes in order to compile (nw)
Diffstat (limited to '3rdparty/expat/lib')
-rw-r--r-- | 3rdparty/expat/lib/intconfig.h | 19 | ||||
-rw-r--r-- | 3rdparty/expat/lib/xmlparse.c | 12 | ||||
-rw-r--r-- | 3rdparty/expat/lib/xmlrole.c | 14 | ||||
-rw-r--r-- | 3rdparty/expat/lib/xmltok.c | 14 |
4 files changed, 22 insertions, 37 deletions
diff --git a/3rdparty/expat/lib/intconfig.h b/3rdparty/expat/lib/intconfig.h new file mode 100644 index 00000000000..88092e6a006 --- /dev/null +++ b/3rdparty/expat/lib/intconfig.h @@ -0,0 +1,19 @@ +#ifndef INTCONFIG_H +#define INTCONFIG_H + +#include <stdlib.h> +#include <string.h> + +#define XML_NS 1 +#define XML_DTD 1 +#define XML_CONTEXT_BYTES 1024 + +#ifdef USE_LSB +#define BYTEORDER 1234 +#else +#define BYTEORDER 4321 +#endif + +#define HAVE_MEMMOVE + +#endif diff --git a/3rdparty/expat/lib/xmlparse.c b/3rdparty/expat/lib/xmlparse.c index f35aa36ba8a..7244741ad3d 100644 --- a/3rdparty/expat/lib/xmlparse.c +++ b/3rdparty/expat/lib/xmlparse.c @@ -10,17 +10,7 @@ #define XML_BUILDING_EXPAT 1 -#ifdef COMPILED_FROM_DSP -#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 COMPILED_FROM_DSP */ +#include "intconfig.h" #include "ascii.h" #include "expat.h" diff --git a/3rdparty/expat/lib/xmlrole.c b/3rdparty/expat/lib/xmlrole.c index 44772e21dd3..bf6d30f30a8 100644 --- a/3rdparty/expat/lib/xmlrole.c +++ b/3rdparty/expat/lib/xmlrole.c @@ -4,19 +4,7 @@ #include <stddef.h> -#ifdef COMPILED_FROM_DSP -#include "winconfig.h" -#elif defined(MACOS_CLASSIC) -#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> -#endif -#endif /* ndef COMPILED_FROM_DSP */ +#include "intconfig.h" #include "expat_external.h" #include "internal.h" diff --git a/3rdparty/expat/lib/xmltok.c b/3rdparty/expat/lib/xmltok.c index bf09dfc72b9..dcc6fde724c 100644 --- a/3rdparty/expat/lib/xmltok.c +++ b/3rdparty/expat/lib/xmltok.c @@ -4,19 +4,7 @@ #include <stddef.h> -#ifdef COMPILED_FROM_DSP -#include "winconfig.h" -#elif defined(MACOS_CLASSIC) -#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> -#endif -#endif /* ndef COMPILED_FROM_DSP */ +#include "intconfig.h" #include "expat_external.h" #include "internal.h" |