diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2012-08-17 00:05:26 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2012-08-17 00:05:26 -0400 |
| commit | 470d0b9789981bc91a8ef2654911d80ab6a6be57 (patch) | |
| tree | 86802b7e189e61fe97f13aee1dc0c692c0d7a65e /src/backend/utils/adt/xml.c | |
| parent | 305557984dd964ac397c6752e9d0f14646b60f15 (diff) | |
| download | postgresql-470d0b9789981bc91a8ef2654911d80ab6a6be57.tar.gz postgresql-470d0b9789981bc91a8ef2654911d80ab6a6be57.zip | |
Check LIBXML_VERSION instead of testing in configure script.
We had put a test for libxml2's xmlStructuredErrorContext variable in
configure, but of course that doesn't work on Windows builds. The next
best alternative seems to be to test the LIBXML_VERSION symbol provided
by xmlversion.h.
Per report from Talha Bin Rizwan, though this fixes it in a different way
than his proposed patch.
Diffstat (limited to 'src/backend/utils/adt/xml.c')
| -rw-r--r-- | src/backend/utils/adt/xml.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/backend/utils/adt/xml.c b/src/backend/utils/adt/xml.c index a358de68728..2d945b9cdba 100644 --- a/src/backend/utils/adt/xml.c +++ b/src/backend/utils/adt/xml.c @@ -52,9 +52,19 @@ #include <libxml/tree.h> #include <libxml/uri.h> #include <libxml/xmlerror.h> +#include <libxml/xmlversion.h> #include <libxml/xmlwriter.h> #include <libxml/xpath.h> #include <libxml/xpathInternals.h> + +/* + * We used to check for xmlStructuredErrorContext via a configure test; but + * that doesn't work on Windows, so instead use this grottier method of + * testing the library version number. + */ +#if LIBXML_VERSION >= 20704 +#define HAVE_XMLSTRUCTUREDERRORCONTEXT 1 +#endif #endif /* USE_LIBXML */ #include "catalog/namespace.h" @@ -970,7 +980,7 @@ pg_xml_init(PgXmlStrictness strictness) * * The only known situation in which this test fails is if we compile with * headers from a libxml2 that doesn't track the structured error context - * separately (<= 2.7.3), but at runtime use a version that does, or vice + * separately (< 2.7.4), but at runtime use a version that does, or vice * versa. The libxml2 authors did not treat that change as constituting * an ABI break, so the LIBXML_TEST_VERSION test in pg_xml_init_library * fails to protect us from this. |