Use wxBORDER_NONE for wxGridCellTextEditor on all platforms, not just wxMSW

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

diff --git a/src/expat/lib/xmlparse.c b/src/expat/lib/xmlparse.c
index c55c768002a535e9353da47e34392ebdb751d9b2..7dbabe8124a69fdf546a29a885cb6a5004561871 100644 (file)
--- a/src/expat/lib/xmlparse.c
+++ b/src/expat/lib/xmlparse.c
@@ -10,6 +10,16 @@
 #include "winconfig.h"
 #include "expat.h"
 
 #include "winconfig.h"
 #include "expat.h"
 

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

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


@@ -17,7 +27,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


@@ -4671,7 +4681,7 @@ defineAttribute(ELEMENT_TYPE *type, ATTRIBUTE_ID *attId, XML_Bool isCdata,
   if (type->nDefaultAtts == type->allocDefaultAtts) {
     if (type->allocDefaultAtts == 0) {
       type->allocDefaultAtts = 8;
   if (type->nDefaultAtts == type->allocDefaultAtts) {
     if (type->allocDefaultAtts == 0) {
       type->allocDefaultAtts = 8;

-      type->defaultAtts = (DEFAULT_ATTRIBUTE *)MALLOC(type->allocDefaultAtts 
+      type->defaultAtts = (DEFAULT_ATTRIBUTE *)MALLOC(type->allocDefaultAtts

                             * sizeof(DEFAULT_ATTRIBUTE));
       if (!type->defaultAtts)
         return 0;
                             * sizeof(DEFAULT_ATTRIBUTE));
       if (!type->defaultAtts)
         return 0;


@@ -5535,8 +5545,8 @@ poolGrow(STRING_POOL *pool)
     int blockSize = (pool->end - pool->start)*2;
     pool->blocks = (BLOCK *)
       pool->mem->realloc_fcn(pool->blocks,
     int blockSize = (pool->end - pool->start)*2;
     pool->blocks = (BLOCK *)
       pool->mem->realloc_fcn(pool->blocks,

-                            (offsetof(BLOCK, s)
-                             + blockSize * sizeof(XML_Char)));
+                             (offsetof(BLOCK, s)
+                             + blockSize * sizeof(XML_Char)));

     if (pool->blocks == NULL)
       return XML_FALSE;
     pool->blocks->size = blockSize;
     if (pool->blocks == NULL)
       return XML_FALSE;
     pool->blocks->size = blockSize;


@@ -5552,7 +5562,7 @@ poolGrow(STRING_POOL *pool)
     else
       blockSize *= 2;
     tem = (BLOCK *)pool->mem->malloc_fcn(offsetof(BLOCK, s)
     else
       blockSize *= 2;
     tem = (BLOCK *)pool->mem->malloc_fcn(offsetof(BLOCK, s)

-                                       + blockSize * sizeof(XML_Char));
+                                         + blockSize * sizeof(XML_Char));

     if (!tem)
       return XML_FALSE;
     tem->size = blockSize;
     if (!tem)
       return XML_FALSE;
     tem->size = blockSize;