Even more forcing of include file names.

(It's a good thing Windows doesn't ship Expat, since apparently
every other platform does)

diff --git a/3rdparty/expat/xmlparse.c b/3rdparty/expat/xmlparse.c
index 822dc1707a5a9ac812f7dc50b171b03da0afb62e..e4fb313fa4cc8124b3b32c66a5ee88dbf9e5a560 100644 (file)
--- a/3rdparty/expat/xmlparse.c
+++ b/3rdparty/expat/xmlparse.c
@@ -23,7 +23,7 @@
 #endif /* ndef COMPILED_FROM_DSP */
 
 #include "ascii.h"
-#include "expat.h"
+#include "sg_expat.h"
 
 #ifdef XML_UNICODE
 #define XML_ENCODE_MAX XML_UTF16_ENCODE_MAX

diff --git a/3rdparty/expat/xmlrole.c b/3rdparty/expat/xmlrole.c
index ae8ae0125ccd1d726c0f26ac9a7f940f9d6eaab3..0bb159f54ee5f6de139475c8f52f47b525b5a6ed 100644 (file)
--- a/3rdparty/expat/xmlrole.c
+++ b/3rdparty/expat/xmlrole.c
@@ -18,7 +18,7 @@
 #endif
 #endif /* ndef COMPILED_FROM_DSP */
 
-#include "expat_external.h"
+#include "sg_expat_external.h"
 #include "internal.h"
 #include "xmlrole.h"
 #include "ascii.h"

diff --git a/3rdparty/expat/xmltok.c b/3rdparty/expat/xmltok.c
index 1662e941b26475a17b50ff22c954c550c5f2af17..5a8bd13289651a276a4d6d2bf5fbb9ba48b80553 100644 (file)
--- a/3rdparty/expat/xmltok.c
+++ b/3rdparty/expat/xmltok.c
@@ -18,7 +18,7 @@
 #endif
 #endif /* ndef COMPILED_FROM_DSP */
 
-#include "expat_external.h"
+#include "sg_expat_external.h"
 #include "internal.h"
 #include "xmltok.h"
 #include "nametab.h"