From c1c8adb7fbbbe7be18f5f6652357e1ad1d0aeddd Mon Sep 17 00:00:00 2001 From: Francois Andriot Date: Mon, 28 Jan 2013 22:47:09 +0100 Subject: Fix docbook support with libxml2 >= 2.6.x --- kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp b/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp index d333c737..88f811b4 100644 --- a/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp +++ b/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp @@ -975,9 +975,13 @@ xsldbgLoadXmlData(void) #endif #ifdef LIBXML_DOCB_ENABLED if (optionsGetIntOption(OPTIONS_DOCBOOK)) +# if LIBXML_VERSION >= 20600 + doc = xmlParseFile((char *) optionsGetStringOption(OPTIONS_DATA_FILE_NAME)); +# else doc = docbParseFile((char *) optionsGetStringOption(OPTIONS_DATA_FILE_NAME), NULL); +# endif else #endif @@ -1027,7 +1031,11 @@ xsldbgLoadXmlTemporary(const xmlChar * path) #endif #ifdef LIBXML_DOCB_ENABLED if (optionsGetIntOption(OPTIONS_DOCBOOK)) +# if LIBXML_VERSION >= 20600 + doc = xmlParseFile((char *) path); +# else doc = docbParseFile((char *) path, NULL); +# endif else #endif doc = xmlSAXParseFile(&mySAXhdlr, (char *) path, 0); -- cgit v1.2.3