mingw: #ifdef unneeded #define in common.h

common.h has some #define when doing win32 build to workaround a few
missing functions on these systems. However, since mingw32 has some
of these, this causes either warnings about redefining preprocessor
symbols or wreak havoc in mingw headers trying to use these symbols.
This commit wraps these symbols in an #ifndef __MINGW32__ to avoid
using them on this platform.
This commit is contained in:
Christophe Fergeau 2012-02-29 19:01:55 +01:00 committed by Alon Levy
parent 5989e2d1c4
commit 4ec9ac20fc

View File

@ -44,6 +44,7 @@
#ifdef __GNUC__
#define UNICODE 1
#define _UNICODE 1
#if !defined __MINGW32__
#define WINVER 0x0501
#define swprintf_s(_str, _len, _fmt, ...) \
swprintf(_str, _fmt, ## __VA_ARGS__)
@ -51,6 +52,7 @@
vsnprintf(_str, _len2, _fmt, _valist)
#define _ftime_s(_t) _ftime(_t)
#endif
#endif
#include <winsock2.h>
#include <windows.h>