diff options
| author | Paul Duffin <paulduffin@google.com> | 2017-02-27 14:48:15 +0000 |
|---|---|---|
| committer | Paul Duffin <paulduffin@google.com> | 2017-02-27 14:59:26 +0000 |
| commit | 2c4085a68c6cc84362eccc3a7bcc588700955c17 (patch) | |
| tree | e81c9b03ab8e2490f42ef79766dc3ef127467fec | |
| parent | ba34a0c0eeed7538bd405826bf3ac25cecf71c90 (diff) | |
Reverted change to switch from COMPILED_FROM_DSP to WIN32
Bug: 30157673
Test: cannot test as does not yet compile
Change-Id: Iba4c9d9c8257f1033159ee0ad8a0aceec6069847
| -rw-r--r-- | README.version | 3 | ||||
| -rw-r--r-- | lib/xmlparse.c | 8 | ||||
| -rw-r--r-- | lib/xmlrole.c | 4 | ||||
| -rw-r--r-- | lib/xmltok.c | 4 |
4 files changed, 11 insertions, 8 deletions
diff --git a/README.version b/README.version index 8abf0fa..dab2257 100644 --- a/README.version +++ b/README.version @@ -1,3 +1,6 @@ URL: https://sourceforge.net/projects/expat/files/expat/2.2.0/expat-2.2.0.tar.bz2/download Version: 2.2.0 BugComponent: 24949 + +Local Changes: + Reverted change to switch from COMPILED_FROM_DSP to WIN32. This was needed in order to get it to compile as winconfig.h is not available. diff --git a/lib/xmlparse.c b/lib/xmlparse.c index b308e67..eac228b 100644 --- a/lib/xmlparse.c +++ b/lib/xmlparse.c @@ -7,7 +7,7 @@ #include <assert.h> #include <limits.h> /* UINT_MAX */ -#ifdef WIN32 +#ifdef COMPILED_FROM_DSP #define getpid GetCurrentProcessId #else #include <sys/time.h> /* gettimeofday() */ @@ -17,7 +17,7 @@ #define XML_BUILDING_EXPAT 1 -#ifdef WIN32 +#ifdef COMPILED_FROM_DSP #include "winconfig.h" #elif defined(MACOS_CLASSIC) #include "macconfig.h" @@ -27,7 +27,7 @@ #include "watcomconfig.h" #elif defined(HAVE_EXPAT_CONFIG_H) #include <expat_config.h> -#endif /* ndef WIN32 */ +#endif /* ndef COMPILED_FROM_DSP */ #include "ascii.h" #include "expat.h" @@ -700,7 +700,7 @@ static const XML_Char implicitContext[] = { static unsigned long gather_time_entropy(void) { -#ifdef WIN32 +#ifdef COMPILED_FROM_DSP FILETIME ft; GetSystemTimeAsFileTime(&ft); /* never fails */ return ft.dwHighDateTime ^ ft.dwLowDateTime; diff --git a/lib/xmlrole.c b/lib/xmlrole.c index fcd0dc6..8a68e20 100644 --- a/lib/xmlrole.c +++ b/lib/xmlrole.c @@ -4,7 +4,7 @@ #include <stddef.h> -#ifdef WIN32 +#ifdef COMPILED_FROM_DSP #include "winconfig.h" #elif defined(MACOS_CLASSIC) #include "macconfig.h" @@ -16,7 +16,7 @@ #ifdef HAVE_EXPAT_CONFIG_H #include <expat_config.h> #endif -#endif /* ndef WIN32 */ +#endif /* ndef COMPILED_FROM_DSP */ #include "expat_external.h" #include "internal.h" diff --git a/lib/xmltok.c b/lib/xmltok.c index a29d9e2..daa3565 100644 --- a/lib/xmltok.c +++ b/lib/xmltok.c @@ -4,7 +4,7 @@ #include <stddef.h> -#ifdef WIN32 +#ifdef COMPILED_FROM_DSP #include "winconfig.h" #elif defined(MACOS_CLASSIC) #include "macconfig.h" @@ -16,7 +16,7 @@ #ifdef HAVE_EXPAT_CONFIG_H #include <expat_config.h> #endif -#endif /* ndef WIN32 */ +#endif /* ndef COMPILED_FROM_DSP */ #include "expat_external.h" #include "internal.h" |