From 473e2905405cbd3098b42bd507806f8918fa4721 Mon Sep 17 00:00:00 2001 From: ejcoumans Date: Mon, 19 Jun 2006 20:56:20 +0000 Subject: [PATCH] use config-win32 for visual studio builds disabled 2 libxml settings (CATALOG & ICONV), to get it to compile --- Extras/LibXML/include/libxml/xmlversion.h | 4 ++-- Extras/LibXML/libxml.h | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Extras/LibXML/include/libxml/xmlversion.h b/Extras/LibXML/include/libxml/xmlversion.h index 68ed386a9..08e4beff3 100644 --- a/Extras/LibXML/include/libxml/xmlversion.h +++ b/Extras/LibXML/include/libxml/xmlversion.h @@ -218,7 +218,7 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version); * * Whether the Catalog support is configured in */ -#if 1 +#if 0 #define LIBXML_CATALOG_ENABLED #endif @@ -263,7 +263,7 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version); * * Whether iconv support is available */ -#if 1 +#if 0 #define LIBXML_ICONV_ENABLED #endif diff --git a/Extras/LibXML/libxml.h b/Extras/LibXML/libxml.h index 696be62e7..1eddb9ef2 100644 --- a/Extras/LibXML/libxml.h +++ b/Extras/LibXML/libxml.h @@ -21,8 +21,12 @@ #if defined(macintosh) #include "config-mac.h" #else +#ifdef _MSC_VER +#include "config-win32.h" +#else #include "config.h" #include +#endif //_MSVC #endif #if defined(__Lynx__)