carnold 2004/10/08 17:36:06
Modified: include/log4cxx/helpers gnomexml.h
Log:
LOGCXX-21: Add compile time check for libxml2, not libxml, include files
Revision Changes Path
1.8 +13 -0 logging-log4cxx/include/log4cxx/helpers/gnomexml.h
Index: gnomexml.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/helpers/gnomexml.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gnomexml.h 13 Aug 2004 12:27:46 -0000 1.7
+++ gnomexml.h 9 Oct 2004 00:36:06 -0000 1.8
@@ -26,6 +26,19 @@
#include <libxml/tree.h>
+//
+// This checks that tree.h is from libxml2 not libxml
+// The name of this class might tempt you to put /usr/include/gnome-xml
+// in the include path which, at least for my distribution, is libxml.
+// libxml2 is located in /usr/include/libxml2. Note: gnomexml.cpp
+// can compile for both libxml and libxml2 if ".children" is
+// replaced by ".xmlChildrenNode" and "#include <libxml/parse.h>" is
+// added. See bug report LOGCXX-21.
+//
+#if LIBXML_VERSION < 20000
+#error libxml include file found where libxml2 was expected
+#endif
+
namespace log4cxx
{
namespace helpers
