[Expat-checkins] expat/lib xmlparse.c, 1.114, 1.115 xmlrole.c, 1.14, 1.15 xmltok.c, 1.28, 1.29

[Fred L. Drake]

Update of /cvsroot/expat/expat/lib
In directory sc8-pr-cvs1:/tmp/cvs-serv1498/lib

Modified Files:
	xmlparse.c xmlrole.c xmltok.c 
Log Message:
Make it possible to avoid the import of expat_config.h.  This makes it
easier to compile Expat without the autoconf support.
This closes SF patch #458907.


Index: xmlparse.c
===================================================================
RCS file: /cvsroot/expat/expat/lib/xmlparse.c,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -d -r1.114 -r1.115
--- xmlparse.c	16 Oct 2003 04:23:44 -0000	1.114
+++ xmlparse.c	16 Oct 2003 04:51:11 -0000	1.115
@@ -12,7 +12,9 @@
 #elif defined(MACOS_CLASSIC)
 #include "macconfig.h"
 #else
+#ifdef HAVE_EXPAT_CONFIG_H
 #include <expat_config.h>
+#endif
 #endif /* ndef COMPILED_FROM_DSP */
 
 #include "expat.h"

Index: xmlrole.c
===================================================================
RCS file: /cvsroot/expat/expat/lib/xmlrole.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- xmlrole.c	20 Sep 2002 03:42:43 -0000	1.14
+++ xmlrole.c	16 Oct 2003 04:51:11 -0000	1.15
@@ -7,7 +7,9 @@
 #elif defined(MACOS_CLASSIC)
 #include "macconfig.h"
 #else
+#ifdef HAVE_EXPAT_CONFIG_H
 #include <expat_config.h>
+#endif
 #endif /* ndef COMPILED_FROM_DSP */
 
 #include "internal.h"

Index: xmltok.c
===================================================================
RCS file: /cvsroot/expat/expat/lib/xmltok.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- xmltok.c	14 Dec 2002 03:12:18 -0000	1.28
+++ xmltok.c	16 Oct 2003 04:51:11 -0000	1.29
@@ -7,7 +7,9 @@
 #elif defined(MACOS_CLASSIC)
 #include "macconfig.h"
 #else
+#ifdef HAVE_EXPAT_CONFIG_H
 #include <expat_config.h>
+#endif
 #endif /* ndef COMPILED_FROM_DSP */
 
 #include "internal.h"