wxOS2 with Open Watcom: correct PCH usage, missing headers, warning fixes, source cleaning and other Watcom adjustements.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34905 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
26
src/expat/lib/os2config.h
Normal file
26
src/expat/lib/os2config.h
Normal file
@@ -0,0 +1,26 @@
|
||||
/*================================================================
|
||||
** Copyright 2000, Clark Cooper
|
||||
** All rights reserved.
|
||||
**
|
||||
** This is free software. You are permitted to copy, distribute, or modify
|
||||
** it under the terms of the MIT/X license (contained in the COPYING file
|
||||
** with this distribution.)
|
||||
*/
|
||||
|
||||
#ifndef OS2CONFIG_H
|
||||
#define OS2CONFIG_H
|
||||
|
||||
#include <memory.h>
|
||||
#include <string.h>
|
||||
|
||||
#define XML_NS 1
|
||||
#define XML_DTD 1
|
||||
#define XML_CONTEXT_BYTES 1024
|
||||
|
||||
/* we will assume all OS2 platforms are little endian */
|
||||
#define BYTEORDER 1234
|
||||
|
||||
/* OS2 has memmove() available. */
|
||||
#define HAVE_MEMMOVE
|
||||
|
||||
#endif /* ndef OS2CONFIG_H */
|
@@ -10,6 +10,11 @@
|
||||
#include "winconfig.h"
|
||||
#include "expat.h"
|
||||
|
||||
#elif defined(OS2_32)
|
||||
|
||||
#include "os2config.h"
|
||||
#include "expat.h"
|
||||
|
||||
#elif defined(MACOS_CLASSIC)
|
||||
|
||||
#include "macconfig.h"
|
||||
@@ -5535,8 +5540,8 @@ poolGrow(STRING_POOL *pool)
|
||||
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;
|
||||
@@ -5552,7 +5557,7 @@ poolGrow(STRING_POOL *pool)
|
||||
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;
|
||||
|
@@ -4,6 +4,8 @@
|
||||
|
||||
#ifdef COMPILED_FROM_DSP
|
||||
#include "winconfig.h"
|
||||
#elif defined(OS2_32)
|
||||
#include "os2config.h"
|
||||
#elif defined(MACOS_CLASSIC)
|
||||
#include "macconfig.h"
|
||||
#else
|
||||
|
@@ -4,6 +4,8 @@
|
||||
|
||||
#ifdef COMPILED_FROM_DSP
|
||||
#include "winconfig.h"
|
||||
#elif defined(OS2_32)
|
||||
#include "os2config.h"
|
||||
#elif defined(MACOS_CLASSIC)
|
||||
#include "macconfig.h"
|
||||
#else
|
||||
|
Reference in New Issue
Block a user