Commit 22030ef8 authored by Daniel Veillard's avatar Daniel Veillard

Restore code for Windows compilation

Try to keep as close to rc1 but still allow the change from Roumen for
mingw
parent ee8f1d4c
......@@ -28,7 +28,9 @@
#include "libxml_wrap.h"
#include "libxml2-py.h"
#if defined(WITH_TRIO)
#if defined(_MSC_VER) && !defined(vsnprintf)
#define vsnprintf(b,c,f,a) _vsnprintf(b,c,f,a)
#elif defined(WITH_TRIO) && !defined(vsnprintf)
#include "trio.h"
#define vsnprintf trio_vsnprintf
#endif
......
......@@ -38,6 +38,10 @@
static FILE *logfile = NULL;
static int verbose = 0;
#if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__MINGW32__)
#define vsnprintf _vsnprintf
#define snprintf _snprintf
#endif
/************************************************************************
* *
......
......@@ -194,6 +194,11 @@ static void globfree(glob_t *pglob) {
free(pglob->gl_pathv[i]);
}
}
#if !defined(__MINGW32__)
#define vsnprintf _vsnprintf
#define snprintf _snprintf
#endif
#else
#include <glob.h>
#endif
......
......@@ -37,6 +37,10 @@ static int verbose = 0;
#define NB_EXPECTED_ERRORS 15
#if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__MINGW32__)
#define vsnprintf _vsnprintf
#define snprintf _snprintf
#endif
const char *skipped_tests[] = {
/* http://lists.w3.org/Archives/Public/public-xml-testsuite/2008Jul/0000.html */
......
......@@ -19,7 +19,7 @@
#include <libxml/xmlerror.h>
#include <libxml/relaxng.h>
#if defined(_WIN32) && !defined(__CYGWIN__)
#if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__MINGW32__)
#define snprintf _snprintf
#endif
......@@ -148,6 +148,11 @@ static void globfree(glob_t *pglob) {
free(pglob->gl_pathv[i]);
}
}
#if !defined(__MINGW32__)
#define vsnprintf _vsnprintf
#define snprintf _snprintf
#endif
#else
#include <glob.h>
#endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment