Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix VsnprintfTestCase::P() for mingw32 which may use MSVC CRT (closes #10679)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60016 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-04-04 16:02:23 +00:00
parent 17db93e969
commit 3879212eee
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/strings/vsnprintf.cpp
View File

@@ -235,7 +235,8 @@ void VsnprintfTestCase::P()
// printed as '(nil)'. // printed as '(nil)'.
// MSVC always print them as %8X on 32 bit systems and as %16X // MSVC always print them as %8X on 32 bit systems and as %16X
// on 64 bit systems // on 64 bit systems
#ifdef __VISUALC__ // mingw32 uses MSVC CRT by default so uses the same rules
#if defined(__VISUALC__) || (defined(__MINGW32__) && !__USE_MINGW_ANSI_STDIO)
#if SIZEOF_VOID_P == 4 #if SIZEOF_VOID_P == 4
CMP3("00ABCDEF", "%p", (void*)0xABCDEF); CMP3("00ABCDEF", "%p", (void*)0xABCDEF);
CMP3("00000000", "%p", (void*)NULL); CMP3("00000000", "%p", (void*)NULL);
@@ -243,6 +244,9 @@ void VsnprintfTestCase::P()
CMP3("0000ABCDEFABCDEF", "%p", (void*)0xABCDEFABCDEF); CMP3("0000ABCDEFABCDEF", "%p", (void*)0xABCDEFABCDEF);
CMP3("0000000000000000", "%p", (void*)NULL); CMP3("0000000000000000", "%p", (void*)NULL);
#endif #endif
#elif defined(__MINGW32__)
CMP3("0xabcdef", "%p", (void*)0xABCDEF);
CMP3("0", "%p", (void*)NULL);
#elif defined(__GNUG__) #elif defined(__GNUG__)
CMP3("0xabcdef", "%p", (void*)0xABCDEF); CMP3("0xabcdef", "%p", (void*)0xABCDEF);
CMP3("(nil)", "%p", (void*)NULL); CMP3("(nil)", "%p", (void*)NULL);