Closed bug 22941, Daniel
diff --git a/ChangeLog b/ChangeLog
index 54a1c84..9d7bfb3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Sep  3 19:19:29 CEST 2000
+
+	* xmlversion.h.in: closed bug 22941
+
 Thu Aug 31 16:55:55 CEST 2000 Daniel Veillard <Daniel.Veillard@w3.org>
 
 	* doc/xmlio.html: added doc and example for entity loader
diff --git a/include/libxml/xmlversion.h.in b/include/libxml/xmlversion.h.in
index fa50afd..664d89d 100644
--- a/include/libxml/xmlversion.h.in
+++ b/include/libxml/xmlversion.h.in
@@ -9,6 +9,10 @@
 #ifndef __XML_VERSION_H__
 #define __XML_VERSION_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*
  * use those to be sure nothing nasty will happen if
  * your library and includes mismatch
@@ -79,6 +83,9 @@
 #define DEBUG_MEMORY_LOCATION
 #endif
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
 #endif
 
 
diff --git a/xmlversion.h.in b/xmlversion.h.in
index fa50afd..664d89d 100644
--- a/xmlversion.h.in
+++ b/xmlversion.h.in
@@ -9,6 +9,10 @@
 #ifndef __XML_VERSION_H__
 #define __XML_VERSION_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*
  * use those to be sure nothing nasty will happen if
  * your library and includes mismatch
@@ -79,6 +83,9 @@
 #define DEBUG_MEMORY_LOCATION
 #endif
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
 #endif