Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Supporting updated expat for Xcode builds

Browse Source
This commit is contained in:
Stefan Csomor
2017-07-21 16:52:39 +02:00
parent 0c06fc6358
commit 537cf17ca9
4 changed files with 39 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
src/expat/lib/macconfig.h
View File

@@ -11,43 +11,39 @@
#ifndef MACCONFIG_H #ifndef MACCONFIG_H
#define MACCONFIG_H #define MACCONFIG_H
/* use wxWidgets' configure */
#include "wx/setup.h"
/* 1234 = LIL_ENDIAN, 4321 = BIGENDIAN */ #ifdef WORDS_BIGENDIAN
#define BYTEORDER 4321 #define BYTEORDER 4321
#else
#define BYTEORDER 1234
#endif
/* Define to 1 if you have the `bcopy' function. */ #define STDC_HEADERS 1
#undef HAVE_BCOPY #define HAVE_SYS_TYPES_H 1
#define HAVE_SYS_STAT_H 1
/* Define to 1 if you have the `memmove' function. */ #define HAVE_STDLIB_H 1
#define HAVE_MEMMOVE #define HAVE_STRING_H 1
#define HAVE_MEMORY_H 1
/* Define to 1 if you have a working `mmap' system call. */ #define HAVE_STRINGS_H 1
#undef HAVE_MMAP #define HAVE_INTTYPES_H 1
#define HAVE_STDINT_H 1
/* Define to 1 if you have the <unistd.h> header file. */ #define HAVE_UNISTD_H 1
#undef HAVE_UNISTD_H #define HAVE_DLFCN_H 1
#define STDC_HEADERS 1
/* whether byteorder is bigendian */ #define HAVE_MEMMOVE 1
#define WORDS_BIGENDIAN #define HAVE_BCOPY 1
#define HAVE_ARC4RANDOM_BUF 1
/* Define to specify how much context to retain around the current parse #define HAVE_FCNTL_H 1
point. */ #define HAVE_UNISTD_H 1
#undef XML_CONTEXT_BYTES #define HAVE_STDLIB_H 1
#define HAVE_UNISTD_H 1
/* Define to make parameter entity parsing functionality available. */ #define HAVE_SYS_PARAM_H 1
#define XML_DTD #define HAVE_GETPAGESIZE 1
#define HAVE_MMAP 1
/* Define to make XML Namespaces functionality available. */ #define XML_NS 1
#define XML_NS #define XML_DTD 1
#define XML_CONTEXT_BYTES 1024
/* Define to empty if `const' does not conform to ANSI C. */
#undef const
/* Define to `long' if <sys/types.h> does not define. */
#define off_t long
/* Define to `unsigned' if <sys/types.h> does not define. */
#undef size_t
#endif /* ifndef MACCONFIG_H */ #endif /* ifndef MACCONFIG_H */

2
src/expat/lib/xmlparse.c
View File

@@ -27,6 +27,8 @@
#ifdef _WIN32 #ifdef _WIN32
#include "winconfig.h" #include "winconfig.h"
#elif defined( __APPLE__ ) && !defined(HAVE_EXPAT_CONFIG_H)
#include "macconfig.h"
#elif defined(HAVE_EXPAT_CONFIG_H) #elif defined(HAVE_EXPAT_CONFIG_H)
#include <expat_config.h> #include <expat_config.h>
#endif /* ndef _WIN32 */ #endif /* ndef _WIN32 */

6
src/expat/lib/xmlrole.c
View File

@@ -6,10 +6,10 @@
#ifdef _WIN32 #ifdef _WIN32
#include "winconfig.h" #include "winconfig.h"
#else #elif defined( __APPLE__ ) && !defined(HAVE_EXPAT_CONFIG_H)
#ifdef HAVE_EXPAT_CONFIG_H #include "macconfig.h"
#elif defined(HAVE_EXPAT_CONFIG_H)
#include <expat_config.h> #include <expat_config.h>
#endif
#endif /* ndef _WIN32 */ #endif /* ndef _WIN32 */
#include "expat_external.h" #include "expat_external.h"

6
src/expat/lib/xmltok.c
View File

@@ -6,10 +6,10 @@
#ifdef _WIN32 #ifdef _WIN32
#include "winconfig.h" #include "winconfig.h"
#else #elif defined( __APPLE__ ) && !defined(HAVE_EXPAT_CONFIG_H)
#ifdef HAVE_EXPAT_CONFIG_H #include "macconfig.h"
#elif defined(HAVE_EXPAT_CONFIG_H)
#include <expat_config.h> #include <expat_config.h>
#endif
#endif /* ndef _WIN32 */ #endif /* ndef _WIN32 */
#include "expat_external.h" #include "expat_external.h"