Author: tkreuzer Date: Tue Apr 6 14:04:47 2010 New Revision: 46746
URL: http://svn.reactos.org/svn/reactos?rev=46746&view=rev Log: [LIBXML2] revert last changes to 3rd party code and hack the config file a bit more instead.
Modified: branches/header-work/lib/3rdparty/libxml2/config.h branches/header-work/lib/3rdparty/libxml2/nanoftp.c branches/header-work/lib/3rdparty/libxml2/nanohttp.c
Modified: branches/header-work/lib/3rdparty/libxml2/config.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/lib/3rdparty/libxml2... ============================================================================== --- branches/header-work/lib/3rdparty/libxml2/config.h [iso-8859-1] (original) +++ branches/header-work/lib/3rdparty/libxml2/config.h [iso-8859-1] Tue Apr 6 14:04:47 2010 @@ -301,3 +301,7 @@ #if !defined(__MINGW32__) || defined(__NO_ISOCEXT) #define vsnprintf _vsnprintf #endif + +#if defined(__MINGW32__) +#include <windows.h> +#endif
Modified: branches/header-work/lib/3rdparty/libxml2/nanoftp.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/lib/3rdparty/libxml2... ============================================================================== --- branches/header-work/lib/3rdparty/libxml2/nanoftp.c [iso-8859-1] (original) +++ branches/header-work/lib/3rdparty/libxml2/nanoftp.c [iso-8859-1] Tue Apr 6 14:04:47 2010 @@ -78,7 +78,7 @@
#if defined(__MINGW32__) || defined(_WIN32_WCE) -//#define _WINSOCKAPI_ +#define _WINSOCKAPI_ #include <wsockcompat.h> #include <winsock2.h> #undef XML_SOCKLEN_T
Modified: branches/header-work/lib/3rdparty/libxml2/nanohttp.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/lib/3rdparty/libxml2... ============================================================================== --- branches/header-work/lib/3rdparty/libxml2/nanohttp.c [iso-8859-1] (original) +++ branches/header-work/lib/3rdparty/libxml2/nanohttp.c [iso-8859-1] Tue Apr 6 14:04:47 2010 @@ -79,7 +79,7 @@ #endif
#if defined(__MINGW32__) || defined(_WIN32_WCE) -//#define _WINSOCKAPI_ +#define _WINSOCKAPI_ #include <wsockcompat.h> #include <winsock2.h> #undef XML_SOCKLEN_T