Work around compilation errors with mingw-w64 and --enable-debug

This commit is contained in:
Tor Lillqvist
2011-08-31 10:58:46 +03:00
parent 5166d6ee7e
commit c477ad1858

View File

@@ -44,8 +44,31 @@
#include <string> #include <string>
#define STRSAFE_NO_DEPRECATE #define STRSAFE_NO_DEPRECATE
#ifdef __MINGW32__
// Work around lack of strsafe library in mingw-w64, do let their
// strsafe.h provide inlines of StringCchVPrintfA etc, avoid linking
// errors in a debug build.
#ifdef __CRT__NO_INLINE
#undef __CRT__NO_INLINE
#define DID_UNDEFINE__CRT__NO_INLINE
#endif
extern "C" {
#endif
#include <strsafe.h> #include <strsafe.h>
#ifdef __MINGW32__
}
#ifdef DID_UNDEFINE__CRT__NO_INLINE
#define __CRT__NO_INLINE
#endif
#endif
//--------------------------------- //---------------------------------
/** Convert a string to a wstring /** Convert a string to a wstring
using CP_ACP using CP_ACP