From 22d1e6dc9ef8bc3d6661547149cdafe7badafcf1 Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Tue, 6 Apr 2010 12:04:47 +0000 Subject: [PATCH] [LIBXML2] revert last changes to 3rd party code and hack the config file a bit more instead. svn path=/branches/header-work/; revision=46746 --- lib/3rdparty/libxml2/config.h | 4 ++++ lib/3rdparty/libxml2/nanoftp.c | 2 +- lib/3rdparty/libxml2/nanohttp.c | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/3rdparty/libxml2/config.h b/lib/3rdparty/libxml2/config.h index 647abdd0b5b..351dc6ef303 100644 --- a/lib/3rdparty/libxml2/config.h +++ b/lib/3rdparty/libxml2/config.h @@ -301,3 +301,7 @@ #if !defined(__MINGW32__) || defined(__NO_ISOCEXT) #define vsnprintf _vsnprintf #endif + +#if defined(__MINGW32__) +#include +#endif diff --git a/lib/3rdparty/libxml2/nanoftp.c b/lib/3rdparty/libxml2/nanoftp.c index 07455433591..a54b85b3a54 100644 --- a/lib/3rdparty/libxml2/nanoftp.c +++ b/lib/3rdparty/libxml2/nanoftp.c @@ -78,7 +78,7 @@ #if defined(__MINGW32__) || defined(_WIN32_WCE) -//#define _WINSOCKAPI_ +#define _WINSOCKAPI_ #include #include #undef XML_SOCKLEN_T diff --git a/lib/3rdparty/libxml2/nanohttp.c b/lib/3rdparty/libxml2/nanohttp.c index c1989cc3727..80e79ed892d 100644 --- a/lib/3rdparty/libxml2/nanohttp.c +++ b/lib/3rdparty/libxml2/nanohttp.c @@ -79,7 +79,7 @@ #endif #if defined(__MINGW32__) || defined(_WIN32_WCE) -//#define _WINSOCKAPI_ +#define _WINSOCKAPI_ #include #include #undef XML_SOCKLEN_T