[ 1509599 ] 'Split pickers page in widgets sample' with more icons and rebaking.

[wxWidgets.git] / src / expat / lib / xmltok.c

diff --git a/src/expat/lib/xmltok.c b/src/expat/lib/xmltok.c
index 5f101afe87eeb2ab343a2ae0b145e1805c665274..9ed6d0333d6fd1534d5b76737830d810b2e21926 100644 (file)
--- a/src/expat/lib/xmltok.c
+++ b/src/expat/lib/xmltok.c
@@ -4,10 +4,14 @@
 
 #ifdef COMPILED_FROM_DSP
 #include "winconfig.h"
 
 #ifdef COMPILED_FROM_DSP
 #include "winconfig.h"

+#elif defined(OS2_32)
+#include "os2config.h"
+#elif defined(__MSDOS__)
+#include "dosconfig.h"

 #elif defined(MACOS_CLASSIC)
 #include "macconfig.h"
 #else
 #elif defined(MACOS_CLASSIC)
 #include "macconfig.h"
 #else

-#include <expat_config.h>
+#include "expat_config.h"

 #endif /* ndef COMPILED_FROM_DSP */
 
 #include "internal.h"
 #endif /* ndef COMPILED_FROM_DSP */
 
 #include "internal.h"


@@ -1330,7 +1334,7 @@ unknown_toUtf16(const ENCODING *enc,
 ENCODING *
 XmlInitUnknownEncoding(void *mem,
                        int *table,
 ENCODING *
 XmlInitUnknownEncoding(void *mem,
                        int *table,

-                       CONVERTER convert, 
+                       CONVERTER convert,

                        void *userData)
 {
   int i;
                        void *userData)
 {
   int i;


@@ -1620,7 +1624,7 @@ initScan(const ENCODING **encodingTable,
 ENCODING *
 XmlInitUnknownEncodingNS(void *mem,
                          int *table,
 ENCODING *
 XmlInitUnknownEncodingNS(void *mem,
                          int *table,

-                         CONVERTER convert, 
+                         CONVERTER convert,

                          void *userData)
 {
   ENCODING *enc = XmlInitUnknownEncoding(mem, table, convert, userData);
                          void *userData)
 {
   ENCODING *enc = XmlInitUnknownEncoding(mem, table, convert, userData);