diff options
author | Sergei Golubchik <sergii@pisem.net> | 2014-10-09 10:30:11 +0200 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2014-10-09 10:30:11 +0200 |
commit | 1b75bed00fa4ea3925f513f4825deb00cb158d5b (patch) | |
tree | 0822ed2a2ca42ba1acb82a6737336bbfe219bebe /storage/connect/libdoc.cpp | |
parent | 689ffe3559a4b7bacd13503ba93659b2f4560bbb (diff) | |
parent | b2d71434ed24d0901155fe68b0b7ee4fdad0e2d4 (diff) | |
download | mariadb-git-1b75bed00fa4ea3925f513f4825deb00cb158d5b.tar.gz |
5.5.40+ merge
Diffstat (limited to 'storage/connect/libdoc.cpp')
-rw-r--r-- | storage/connect/libdoc.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/storage/connect/libdoc.cpp b/storage/connect/libdoc.cpp index e6046a07c5c..d019d1b61d9 100644 --- a/storage/connect/libdoc.cpp +++ b/storage/connect/libdoc.cpp @@ -2,6 +2,7 @@ /* Implementation of XML document processing using libxml2 */ /* Author: Olivier Bertrand 2007-2013 */ /******************************************************************/ +#include "my_global.h" #include <string.h> #include <stdio.h> #include <libxml/parser.h> @@ -11,11 +12,6 @@ #include <libxml/catalog.h> #include <libxml/xmlschemastypes.h> #include <libxml/relaxng.h> -//#if defined(WIN32) -//#include <windows.h> -//#else // !WIN32 -#include "my_global.h" -//#endif // !WIN32 #if !defined(LIBXML_TREE_ENABLED) || !defined(LIBXML_OUTPUT_ENABLED) #error "tree support not compiled in" |