Merge new upstream release

31 files changed, 13 insertions, 13 deletions

diff --git a/xml/ANNOUNCEMENT b/xml/ANNOUNCEMENT
index 64cfd0d..64cfd0d 100644..100755
--- a/xml/ANNOUNCEMENT
+++ b/xml/ANNOUNCEMENT
diff --git a/xml/CHANGES b/xml/CHANGES
index 37a9614..37a9614 100644..100755
--- a/xml/CHANGES
+++ b/xml/CHANGES
diff --git a/xml/COPYING b/xml/COPYING
index 4d0aa78..4d0aa78 100644..100755
--- a/xml/COPYING
+++ b/xml/COPYING
diff --git a/xml/Makefile.in b/xml/Makefile.in
index cc5c34d..cc5c34d 100644..100755
--- a/xml/Makefile.in
+++ b/xml/Makefile.in
diff --git a/xml/README b/xml/README
index 506554d..506554d 100644..100755
--- a/xml/README
+++ b/xml/README
diff --git a/xml/afiles b/xml/afiles
index 85c3914..9814c39 100644..100755
--- a/xml/afiles
+++ b/xml/afiles
@@ -10,7 +10,7 @@ config.h.in
 configure
 configure.in
 install-sh
-config.h
+mxml-config.h
 mxml.h
 mxml-attr.c
 mxml-entity.c
diff --git a/xml/config.h.in b/xml/config.h.in
index 8bae4bf..8bae4bf 100644..100755
--- a/xml/config.h.in
+++ b/xml/config.h.in
diff --git a/xml/configure b/xml/configure
index 821fb83..821fb83 100644..100755
--- a/xml/configure
+++ b/xml/configure
diff --git a/xml/configure.in b/xml/configure.in
index 45e813a..45e813a 100644..100755
--- a/xml/configure.in
+++ b/xml/configure.in
diff --git a/xml/doc/Mini-XML.pdf b/xml/doc/Mini-XML.pdf
index f1718a6..f1718a6 100644..100755
--- a/xml/doc/Mini-XML.pdf
+++ b/xml/doc/Mini-XML.pdf
diff --git a/xml/install-sh b/xml/install-sh
index 398a88e..398a88e 100644..100755
--- a/xml/install-sh
+++ b/xml/install-sh
diff --git a/xml/mxml-attr.c b/xml/mxml-attr.c
index c9950f5..53f8076 100644..100755
--- a/xml/mxml-attr.c
+++ b/xml/mxml-attr.c
@@ -26,7 +26,7 @@
  * Include necessary headers...
  */
 
-#include "config.h"
+#include "mxml-config.h"
 #include "mxml.h"
 
 
diff --git a/xml/config.h b/xml/mxml-config.h
index d0fcb76..072eab9 100644..100755
--- a/xml/config.h
+++ b/xml/mxml-config.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: config.h 408 2010-09-19 05:26:46Z mike $"
+ * "$Id: mxml-config.h 408 2010-09-19 05:26:46Z mike $"
  *
  * Configuration file for Mini-XML, a small XML-like file parsing library.
  *
@@ -200,6 +200,6 @@ extern int	_mxml_vsnprintf(char *, size_t, const char *, va_list);
 #endif	/* UNIX */
 
 /*
- * End of "$Id: config.h 408 2010-09-19 05:26:46Z mike $".
+ * End of "$Id: mxml-config.h 408 2010-09-19 05:26:46Z mike $".
  */
 
diff --git a/xml/mxml-entity.c b/xml/mxml-entity.c
index c5c9f61..c5c9f61 100644..100755
--- a/xml/mxml-entity.c
+++ b/xml/mxml-entity.c
diff --git a/xml/mxml-file.c b/xml/mxml-file.c
index c41ec96..c41ec96 100644..100755
--- a/xml/mxml-file.c
+++ b/xml/mxml-file.c
diff --git a/xml/mxml-get.c b/xml/mxml-get.c
index a5356d5..c8260c3 100644..100755
--- a/xml/mxml-get.c
+++ b/xml/mxml-get.c
@@ -37,7 +37,7 @@
  * Include necessary headers...
  */
 
-#include "config.h"
+#include "mxml-config.h"
 #include "mxml.h"
 
 
diff --git a/xml/mxml-index.c b/xml/mxml-index.c
index b6efc66..3bf17da 100644..100755
--- a/xml/mxml-index.c
+++ b/xml/mxml-index.c
@@ -21,7 +21,7 @@
  * Include necessary headers...
  */
 
-#include "config.h"
+#include "mxml-config.h"
 #include "mxml.h"
 
 
diff --git a/xml/mxml-node.c b/xml/mxml-node.c
index 44af759..bebda10 100644..100755
--- a/xml/mxml-node.c
+++ b/xml/mxml-node.c
@@ -37,7 +37,7 @@
  * Include necessary headers...
  */
 
-#include "config.h"
+#include "mxml-config.h"
 #include "mxml.h"
 
 
diff --git a/xml/mxml-private.c b/xml/mxml-private.c
index 72f3e23..72f3e23 100644..100755
--- a/xml/mxml-private.c
+++ b/xml/mxml-private.c
diff --git a/xml/mxml-private.h b/xml/mxml-private.h
index 8789e6c..02e76d2 100644..100755
--- a/xml/mxml-private.h
+++ b/xml/mxml-private.h
@@ -18,7 +18,7 @@
  * Include necessary headers...
  */
 
-#include "config.h"
+#include "mxml-config.h"
 #include "mxml.h"
 
 
diff --git a/xml/mxml-search.c b/xml/mxml-search.c
index 3b4eb3f..2a02bd7 100644..100755
--- a/xml/mxml-search.c
+++ b/xml/mxml-search.c
@@ -26,7 +26,7 @@
  * Include necessary headers...
  */
 
-#include "config.h"
+#include "mxml-config.h"
 #include "mxml.h"
 
 
diff --git a/xml/mxml-set.c b/xml/mxml-set.c
index b0bd527..3251cc1 100644..100755
--- a/xml/mxml-set.c
+++ b/xml/mxml-set.c
@@ -30,7 +30,7 @@
  * Include necessary headers...
  */
 
-#include "config.h"
+#include "mxml-config.h"
 #include "mxml.h"
 
 
diff --git a/xml/mxml-string.c b/xml/mxml-string.c
index 6be4252..caead17 100644..100755
--- a/xml/mxml-string.c
+++ b/xml/mxml-string.c
@@ -26,7 +26,7 @@
  * Include necessary headers...
  */
 
-#include "config.h"
+#include "mxml-config.h"
 
 
 /*
diff --git a/xml/mxml.h b/xml/mxml.h
index 08784e7..08784e7 100644..100755
--- a/xml/mxml.h
+++ b/xml/mxml.h
diff --git a/xml/mxml.list.in b/xml/mxml.list.in
index fbe6878..fbe6878 100644..100755
--- a/xml/mxml.list.in
+++ b/xml/mxml.list.in
diff --git a/xml/mxml.pc.in b/xml/mxml.pc.in
index 9d48b60..9d48b60 100644..100755
--- a/xml/mxml.pc.in
+++ b/xml/mxml.pc.in
diff --git a/xml/mxml.spec b/xml/mxml.spec
index ca08061..ca08061 100644..100755
--- a/xml/mxml.spec
+++ b/xml/mxml.spec
diff --git a/xml/mxml.xml b/xml/mxml.xml
index bf6b520..bf6b520 100644..100755
--- a/xml/mxml.xml
+++ b/xml/mxml.xml
diff --git a/xml/mxmldoc.c b/xml/mxmldoc.c
index 28316ee..4b26f7e 100644..100755
--- a/xml/mxmldoc.c
+++ b/xml/mxmldoc.c
@@ -48,7 +48,7 @@
  * Include necessary headers...
  */
 
-#include "config.h"
+#include "mxml-config.h"
 #include "mxml.h"
 #include <time.h>
 #include <sys/stat.h>
diff --git a/xml/test.xml b/xml/test.xml
index 044304e..044304e 100644..100755
--- a/xml/test.xml
+++ b/xml/test.xml
diff --git a/xml/testmxml.c b/xml/testmxml.c
index 9bfa498..35186cf 100644..100755
--- a/xml/testmxml.c
+++ b/xml/testmxml.c
@@ -26,7 +26,7 @@
  * Include necessary headers...
  */
 
-#include "config.h"
+#include "mxml-config.h"
 #include "mxml.h"
 #ifndef WIN32
 #  include <unistd.h>