diff options
| author | Francois Andriot <francois.andriot@free.fr> | 2013-01-28 22:47:09 +0100 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2013-01-28 22:48:24 +0100 |
| commit | 8ab68bff9049c79d156fad1e518b43c61274516b (patch) | |
| tree | 238bf5e45ad2bdc5168da746b8c5f56f43918dec | |
| parent | b244f3cc63111926c5abb7775b3067a2af789837 (diff) | |
| download | tdewebdev-8ab68bff9049c79d156fad1e518b43c61274516b.tar.gz tdewebdev-8ab68bff9049c79d156fad1e518b43c61274516b.zip | |
Fix docbook support with libxml2 >= 2.6.x
(cherry picked from commit c1c8adb7fbbbe7be18f5f6652357e1ad1d0aeddd)
| -rw-r--r-- | kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp b/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp index 52066acf..d047ffee 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); |