diff options
| -rw-r--r-- | python/libxml.c | 4 | ||||
| -rw-r--r-- | runsuite.c | 4 | ||||
| -rw-r--r-- | runtest.c | 5 | ||||
| -rw-r--r-- | runxmlconf.c | 4 | ||||
| -rw-r--r-- | testapi.c | 2 | ||||
| -rw-r--r-- | testrecurse.c | 5 |
6 files changed, 22 insertions, 2 deletions
diff --git a/python/libxml.c b/python/libxml.c index ea4998bc..9dabf898 100644 --- a/python/libxml.c +++ b/python/libxml.c @@ -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 diff --git a/runxmlconf.c b/runxmlconf.c index a50021e8..52d50d77 100644 --- a/runxmlconf.c +++ b/runxmlconf.c @@ -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 diff --git a/testrecurse.c b/testrecurse.c index 3a52e263..bdc7c301 100644 --- a/testrecurse.c +++ b/testrecurse.c @@ -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 |