1
0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-07-29 11:41:22 +03:00

clean redefinition of {v}snprintf in C-source

as those from *config.h are preferable (e.g. win32config.h)
This commit is contained in:
Roumen Petrov
2012-08-13 16:50:48 +08:00
committed by Daniel Veillard
parent 1f0453f715
commit c3b1d09ba2
6 changed files with 1 additions and 22 deletions

View File

@ -28,9 +28,7 @@
#include "libxml_wrap.h" #include "libxml_wrap.h"
#include "libxml2-py.h" #include "libxml2-py.h"
#if defined(_MSC_VER) && !defined(vsnprintf) #if defined(WITH_TRIO)
#define vsnprintf(b,c,f,a) _vsnprintf(b,c,f,a)
#elif defined(WITH_TRIO) && !defined(vsnprintf)
#include "trio.h" #include "trio.h"
#define vsnprintf trio_vsnprintf #define vsnprintf trio_vsnprintf
#endif #endif

View File

@ -35,10 +35,6 @@
static FILE *logfile = NULL; static FILE *logfile = NULL;
static int verbose = 0; static int verbose = 0;
#if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__MINGW32__)
#define vsnprintf _vsnprintf
#define snprintf _snprintf
#endif
/************************************************************************ /************************************************************************
* * * *

View File

@ -192,10 +192,6 @@ static void globfree(glob_t *pglob) {
} }
} }
#if !defined(__MINGW32__)
#define vsnprintf _vsnprintf
#define snprintf _snprintf
#endif
#else #else
#include <glob.h> #include <glob.h>
#endif #endif

View File

@ -34,10 +34,6 @@ static int verbose = 0;
#define NB_EXPECTED_ERRORS 15 #define NB_EXPECTED_ERRORS 15
#if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__MINGW32__)
#define vsnprintf _vsnprintf
#define snprintf _snprintf
#endif
const char *skipped_tests[] = { const char *skipped_tests[] = {
/* http://lists.w3.org/Archives/Public/public-xml-testsuite/2008Jul/0000.html */ /* http://lists.w3.org/Archives/Public/public-xml-testsuite/2008Jul/0000.html */

View File

@ -16,9 +16,6 @@
#include <libxml/xmlerror.h> #include <libxml/xmlerror.h>
#include <libxml/relaxng.h> #include <libxml/relaxng.h>
#if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__MINGW32__)
#define snprintf _snprintf
#endif
static int testlibxml2(void); static int testlibxml2(void);
static int test_module(const char *module); static int test_module(const char *module);

View File

@ -146,10 +146,6 @@ static void globfree(glob_t *pglob) {
} }
} }
#if !defined(__MINGW32__)
#define vsnprintf _vsnprintf
#define snprintf _snprintf
#endif
#else #else
#include <glob.h> #include <glob.h>
#endif #endif