[Expat-checkins] expat/lib expat_external.h, NONE, 1.1 expat.dsp,
1.11, 1.12 expat.h, 1.67, 1.68 expat_static.dsp, 1.3,
1.4 expatw.dsp, 1.4, 1.5 expatw_static.dsp, 1.3, 1.4 xmlrole.c,
1.18, 1.19 xmltok.c, 1.31, 1.32 external.h, 1.1, NONE
Karl Waclawek
kwaclaw at users.sourceforge.net
Thu May 6 09:55:52 EDT 2004
Update of /cvsroot/expat/expat/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32649
Modified Files:
expat.dsp expat.h expat_static.dsp expatw.dsp
expatw_static.dsp xmlrole.c xmltok.c
Added Files:
expat_external.h
Removed Files:
external.h
Log Message:
Renamed exrternal.h to expat_external.h.
Fixed up references to this file.
--- NEW FILE: expat_external.h ---
/* Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd
See the file COPYING for copying permission.
*/
/* External API definitions */
#if defined(_MSC_EXTENSIONS) && !defined(__BEOS__) && !defined(__CYGWIN__)
#define XML_USE_MSC_EXTENSIONS 1
#endif
/* Expat tries very hard to make the API boundary very specifically
defined. There are two macros defined to control this boundary;
each of these can be defined before including this header to
achieve some different behavior, but doing so it not recommended or
tested frequently.
XMLCALL - The calling convention to use for all calls across the
"library boundary." This will default to cdecl, and
try really hard to tell the compiler that's what we
want.
XMLIMPORT - Whatever magic is needed to note that a function is
to be imported from a dynamically loaded library
(.dll, .so, or .sl, depending on your platform).
The XMLCALL macro was added in Expat 1.95.7. The only one which is
expected to be directly useful in client code is XMLCALL.
Note that on at least some Unix versions, the Expat library must be
compiled with the cdecl calling convention as the default since
system headers may assume the cdecl convention.
*/
#ifndef XMLCALL
#if defined(XML_USE_MSC_EXTENSIONS)
#define XMLCALL __cdecl
#elif defined(__GNUC__) && defined(__i386)
#define XMLCALL __attribute__((cdecl))
#else
/* For any platform which uses this definition and supports more than
one calling convention, we need to extend this definition to
declare the convention used on that platform, if it's possible to
do so.
If this is the case for your platform, please file a bug report
with information on how to identify your platform via the C
pre-processor and how to specify the same calling convention as the
platform's malloc() implementation.
*/
#define XMLCALL
#endif
#endif /* not defined XMLCALL */
#if !defined(XML_STATIC) && !defined(XMLIMPORT)
#ifndef XML_BUILDING_EXPAT
/* using Expat from an application */
#ifdef XML_USE_MSC_EXTENSIONS
#define XMLIMPORT __declspec(dllimport)
#endif
#endif
#endif /* not defined XML_STATIC */
/* If we didn't define it above, define it away: */
#ifndef XMLIMPORT
#define XMLIMPORT
#endif
#define XMLPARSEAPI(type) XMLIMPORT type XMLCALL
#ifdef __cplusplus
extern "C" {
#endif
#ifdef XML_UNICODE_WCHAR_T
#define XML_UNICODE
#endif
#ifdef XML_UNICODE /* Information is UTF-16 encoded. */
#ifdef XML_UNICODE_WCHAR_T
typedef wchar_t XML_Char;
typedef wchar_t XML_LChar;
#else
typedef unsigned short XML_Char;
typedef char XML_LChar;
#endif /* XML_UNICODE_WCHAR_T */
#else /* Information is UTF-8 encoded. */
typedef char XML_Char;
typedef char XML_LChar;
#endif /* XML_UNICODE */
Index: expat.dsp
===================================================================
RCS file: /cvsroot/expat/expat/lib/expat.dsp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- expat.dsp 26 Mar 2004 14:24:09 -0000 1.11
+++ expat.dsp 6 May 2004 13:55:49 -0000 1.12
@@ -133,7 +133,7 @@
# End Source File
# Begin Source File
-SOURCE=.\external.h
+SOURCE=.\expat_external.h
# End Source File
# Begin Source File
Index: expat.h
===================================================================
RCS file: /cvsroot/expat/expat/lib/expat.h,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- expat.h 27 Apr 2004 00:49:34 -0000 1.67
+++ expat.h 6 May 2004 13:55:49 -0000 1.68
@@ -15,7 +15,7 @@
#endif
#include <stdlib.h>
-#include "external.h"
+#include "expat_external.h"
struct XML_ParserStruct;
typedef struct XML_ParserStruct *XML_Parser;
Index: expat_static.dsp
===================================================================
RCS file: /cvsroot/expat/expat/lib/expat_static.dsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- expat_static.dsp 26 Mar 2004 14:24:10 -0000 1.3
+++ expat_static.dsp 6 May 2004 13:55:49 -0000 1.4
@@ -115,7 +115,7 @@
# End Source File
# Begin Source File
-SOURCE=.\external.h
+SOURCE=.\expat_external.h
# End Source File
# Begin Source File
Index: expatw.dsp
===================================================================
RCS file: /cvsroot/expat/expat/lib/expatw.dsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- expatw.dsp 26 Mar 2004 14:24:10 -0000 1.4
+++ expatw.dsp 6 May 2004 13:55:49 -0000 1.5
@@ -134,7 +134,7 @@
# End Source File
# Begin Source File
-SOURCE=.\external.h
+SOURCE=.\expat_external.h
# End Source File
# Begin Source File
Index: expatw_static.dsp
===================================================================
RCS file: /cvsroot/expat/expat/lib/expatw_static.dsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- expatw_static.dsp 26 Mar 2004 14:24:10 -0000 1.3
+++ expatw_static.dsp 6 May 2004 13:55:49 -0000 1.4
@@ -115,7 +115,7 @@
# End Source File
# Begin Source File
-SOURCE=.\external.h
+SOURCE=.\expat_external.h
# End Source File
# Begin Source File
Index: xmlrole.c
===================================================================
RCS file: /cvsroot/expat/expat/lib/xmlrole.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- xmlrole.c 24 Apr 2004 23:56:41 -0000 1.18
+++ xmlrole.c 6 May 2004 13:55:49 -0000 1.19
@@ -14,7 +14,7 @@
#endif
#endif /* ndef COMPILED_FROM_DSP */
-#include "external.h"
+#include "expat_external.h"
#include "internal.h"
#include "xmlrole.h"
#include "ascii.h"
Index: xmltok.c
===================================================================
RCS file: /cvsroot/expat/expat/lib/xmltok.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- xmltok.c 24 Apr 2004 23:56:41 -0000 1.31
+++ xmltok.c 6 May 2004 13:55:49 -0000 1.32
@@ -14,7 +14,7 @@
#endif
#endif /* ndef COMPILED_FROM_DSP */
-#include "external.h"
+#include "expat_external.h"
#include "internal.h"
#include "xmltok.h"
#include "nametab.h"
--- external.h DELETED ---
More information about the Expat-checkins
mailing list