Fix for bug #1006708.

diff --git a/expat/lib/expat.h b/expat/lib/expat.h
index cb07c1c92e8b522eef5173caf56a10d3bb617c37..bf1e9a82cf0f8786f0ed5c6dd25559adcc64c127 100644 (file)
--- a/expat/lib/expat.h
+++ b/expat/lib/expat.h
@@ -17,6 +17,10 @@
 #include <stdlib.h>
 #include "expat_external.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct XML_ParserStruct;
 typedef struct XML_ParserStruct *XML_Parser;
 

diff --git a/expat/lib/expat_external.h b/expat/lib/expat_external.h
index 4145cacacdfb4fc033e256a9e6f665dbce4ddac3..59eff5814bfa1a3614c7f9c7852a96062f5d5a62 100644 (file)
--- a/expat/lib/expat_external.h
+++ b/expat/lib/expat_external.h
@@ -90,3 +90,7 @@ typedef char XML_LChar;
 typedef char XML_Char;
 typedef char XML_LChar;
 #endif /* XML_UNICODE */
+
+#ifdef __cplusplus
+}
+#endif