adding support for wxCB_SORT

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

diff --git a/src/expat/lib/xmlparse.c b/src/expat/lib/xmlparse.c
index 6e0fa1fc5168642e0b7376c2179c774842cf491c..6c75b135d8b8909c4562f272f078063b8c4e7ee9 100644 (file)
--- a/src/expat/lib/xmlparse.c
+++ b/src/expat/lib/xmlparse.c
@@ -8,9 +8,7 @@
 #ifdef COMPILED_FROM_DSP
 
 #include "winconfig.h"
 #ifdef COMPILED_FROM_DSP
 
 #include "winconfig.h"

-#define XMLPARSEAPI(type) type __cdecl

 #include "expat.h"
 #include "expat.h"

-#undef XMLPARSEAPI

 
 #elif defined(MACOS_CLASSIC)
 
 
 #elif defined(MACOS_CLASSIC)
 


@@ -19,7 +17,7 @@
 
 #else
 
 
 #else
 

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

 
 #ifdef __declspec
 #define XMLPARSEAPI(type) type __cdecl
 
 #ifdef __declspec
 #define XMLPARSEAPI(type) type __cdecl


@@ -4040,7 +4038,8 @@ doProlog(XML_Parser parser,
         name = el->name;
         dtd->scaffold[myindex].name = name;
         nameLen = 0;
         name = el->name;
         dtd->scaffold[myindex].name = name;
         nameLen = 0;

-        for (; name[nameLen++]; );
+        for (; name[nameLen++]; )
+            ;

         dtd->contentStringLen +=  nameLen;
         if (elementDeclHandler)
           handleDefault = XML_FALSE;
         dtd->contentStringLen +=  nameLen;
         if (elementDeclHandler)
           handleDefault = XML_FALSE;