mirror of
https://github.com/libexpat/libexpat.git
synced 2025-04-06 05:34:59 +00:00
Hard to believe, but there are some preprocessors/compilers out there
which don't like spaces between the '#' and the preprocessor command. * expat.h, xmlparse.c, xmlrole.c, xmltok.c: - remove all spaces between the '#' and the cpp command.
This commit is contained in:
parent
2186041a07
commit
5b5355d8c5
4 changed files with 30 additions and 27 deletions
|
@ -8,11 +8,11 @@
|
|||
#include <stdlib.h>
|
||||
|
||||
#ifndef XMLPARSEAPI
|
||||
# if defined(_MSC_EXTENSIONS) && !defined(__BEOS__) && !defined(__CYGWIN__)
|
||||
# define XMLPARSEAPI(type) __declspec(dllimport) type __cdecl
|
||||
# else
|
||||
# define XMLPARSEAPI(type) type
|
||||
# endif
|
||||
#if defined(_MSC_EXTENSIONS) && !defined(__BEOS__) && !defined(__CYGWIN__)
|
||||
#define XMLPARSEAPI(type) __declspec(dllimport) type __cdecl
|
||||
#else
|
||||
#define XMLPARSEAPI(type) type
|
||||
#endif
|
||||
#endif /* not defined XMLPARSEAPI */
|
||||
|
||||
#ifdef __cplusplus
|
||||
|
@ -20,23 +20,23 @@ extern "C" {
|
|||
#endif
|
||||
|
||||
#ifdef XML_UNICODE_WCHAR_T
|
||||
# define XML_UNICODE
|
||||
#define XML_UNICODE
|
||||
#endif
|
||||
|
||||
typedef void *XML_Parser;
|
||||
|
||||
#ifdef XML_UNICODE /* Information is UTF-16 encoded. */
|
||||
# ifdef XML_UNICODE_WCHAR_T
|
||||
#ifdef XML_UNICODE_WCHAR_T
|
||||
typedef wchar_t XML_Char;
|
||||
typedef wchar_t XML_LChar;
|
||||
# else
|
||||
#else
|
||||
typedef unsigned short XML_Char;
|
||||
typedef char XML_LChar;
|
||||
# endif
|
||||
#endif /* XML_UNICODE_WCHAR_T */
|
||||
#else /* Information is UTF-8 encoded. */
|
||||
typedef char XML_Char;
|
||||
typedef char XML_LChar;
|
||||
#endif
|
||||
#endif /* XML_UNICODE */
|
||||
|
||||
enum XML_Content_Type {
|
||||
XML_CTYPE_EMPTY = 1,
|
||||
|
|
|
@ -3,21 +3,24 @@
|
|||
*/
|
||||
|
||||
#ifdef COMPILED_FROM_DSP
|
||||
# include "winconfig.h"
|
||||
# define XMLPARSEAPI(type) __declspec(dllexport) type __cdecl
|
||||
# include "expat.h"
|
||||
# undef XMLPARSEAPI
|
||||
|
||||
#include "winconfig.h"
|
||||
#define XMLPARSEAPI(type) __declspec(dllexport) type __cdecl
|
||||
#include "expat.h"
|
||||
#undef XMLPARSEAPI
|
||||
|
||||
#else
|
||||
|
||||
#include <expat_config.h>
|
||||
|
||||
#ifdef __declspec
|
||||
# define XMLPARSEAPI(type) __declspec(dllexport) type __cdecl
|
||||
#define XMLPARSEAPI(type) __declspec(dllexport) type __cdecl
|
||||
#endif
|
||||
|
||||
#include "expat.h"
|
||||
|
||||
#ifdef __declspec
|
||||
# undef XMLPARSEAPI
|
||||
#undef XMLPARSEAPI
|
||||
#endif
|
||||
#endif /* ndef COMPILED_FROM_DSP */
|
||||
|
||||
|
@ -55,13 +58,13 @@ typedef char ICHAR;
|
|||
|
||||
#ifdef XML_UNICODE
|
||||
|
||||
# ifdef XML_UNICODE_WCHAR_T
|
||||
# define XML_T(x) (const wchar_t)x
|
||||
# define XML_L(x) L ## x
|
||||
# else
|
||||
# define XML_T(x) (const unsigned short)x
|
||||
# define XML_L(x) x
|
||||
# endif
|
||||
#ifdef XML_UNICODE_WCHAR_T
|
||||
#define XML_T(x) (const wchar_t)x
|
||||
#define XML_L(x) L ## x
|
||||
#else
|
||||
#define XML_T(x) (const unsigned short)x
|
||||
#define XML_L(x) x
|
||||
#endif
|
||||
|
||||
#else
|
||||
|
||||
|
|
|
@ -3,9 +3,9 @@
|
|||
*/
|
||||
|
||||
#ifdef COMPILED_FROM_DSP
|
||||
# include "winconfig.h"
|
||||
#include "winconfig.h"
|
||||
#else
|
||||
# include <expat_config.h>
|
||||
#include <expat_config.h>
|
||||
#endif /* ndef COMPILED_FROM_DSP */
|
||||
|
||||
#include "xmlrole.h"
|
||||
|
|
|
@ -3,9 +3,9 @@
|
|||
*/
|
||||
|
||||
#ifdef COMPILED_FROM_DSP
|
||||
# include "winconfig.h"
|
||||
#include "winconfig.h"
|
||||
#else
|
||||
# include <expat_config.h>
|
||||
#include <expat_config.h>
|
||||
#endif /* ndef COMPILED_FROM_DSP */
|
||||
|
||||
#include "xmltok.h"
|
||||
|
|
Loading…
Add table
Reference in a new issue