[Expat-checkins] expat/lib expat.h,1.20,1.21 xmlparse.c,1.37,1.38 xmlrole.c,1.7,1.8 xmltok.c,1.14,1.15

[gstein@users.sourceforge.net]

Update of /cvsroot/expat/expat/lib
In directory usw-pr-cvs1:/tmp/cvs-serv30129

Modified Files:
	expat.h xmlparse.c xmlrole.c xmltok.c 
Log Message:
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.


Index: expat.h
===================================================================
RCS file: /cvsroot/expat/expat/lib/expat.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- expat.h	18 May 2002 03:34:44 -0000	1.20
+++ expat.h	20 May 2002 11:06:40 -0000	1.21
@@ -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 @@
 #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,

Index: xmlparse.c
===================================================================
RCS file: /cvsroot/expat/expat/lib/xmlparse.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- xmlparse.c	18 May 2002 03:34:44 -0000	1.37
+++ xmlparse.c	20 May 2002 11:06:41 -0000	1.38
@@ -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 @@
 
 #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 
                 

Index: xmlrole.c
===================================================================
RCS file: /cvsroot/expat/expat/lib/xmlrole.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- xmlrole.c	18 May 2002 03:34:44 -0000	1.7
+++ xmlrole.c	20 May 2002 11:06:41 -0000	1.8
@@ -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"

Index: xmltok.c
===================================================================
RCS file: /cvsroot/expat/expat/lib/xmltok.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- xmltok.c	17 May 2002 21:42:05 -0000	1.14
+++ xmltok.c	20 May 2002 11:06:41 -0000	1.15
@@ -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"