diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-29 23:35:38 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-29 23:35:38 -0600 |
| commit | 47028b243ed7f2c1e50222ed8721c6006f940b97 (patch) | |
| tree | e0b873973ea8c7e05985dd821023111692ee8d74 | |
| parent | 6e6db807dac66c20a2d946cae6c10ecda0a38e97 (diff) | |
| parent | c1c8adb7fbbbe7be18f5f6652357e1ad1d0aeddd (diff) | |
| download | tdewebdev-47028b243ed7f2c1e50222ed8721c6006f940b97.tar.gz tdewebdev-47028b243ed7f2c1e50222ed8721c6006f940b97.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdewebdev
| -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 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); |