correct WinCE compilation after last change: can't use global scope with GlobalLock...

[wxWidgets.git] / tests / strings / vsnprintf.cpp

diff --git a/tests/strings/vsnprintf.cpp b/tests/strings/vsnprintf.cpp
index 0d404d685e2d45769032a4c806be36f439a64474..61b9abae3f00f5ca234038e614cabfad2952161f 100644 (file)
--- a/tests/strings/vsnprintf.cpp
+++ b/tests/strings/vsnprintf.cpp
@@ -376,7 +376,7 @@ void VsnprintfTestCase::LongLong()
 
 #ifdef __WXMSW__
     CMP3("123456789", "%I64d", (wxLongLong_t)123456789);
-    CMP3("123456789abcdef", "%I64x", (wxLongLong_t)0x123456789abcdef);
+    CMP3("123456789abcdef", "%I64x", wxLL(0x123456789abcdef));
 #endif
 }
 #endif
@@ -463,18 +463,22 @@ void VsnprintfTestCase::WrongFormatStrings()
 
 void VsnprintfTestCase::BigToSmallBuffer()
 {
+    // VC6 can't compile this code
+#if !defined(__VISUALC__) || (__VISUALC__ >= 1310)
+#if wxUSE_UNICODE
     wchar_t bufw[1024], bufw2[16], bufw3[4], bufw4;
-    char bufa[1024], bufa2[16], bufa3[4], bufa4;
-
     Misc(bufw, 1024);
     Misc(bufw2, 16);
     Misc(bufw3, 4);
     Misc(&bufw4, 1);
+#endif // wxUSE_UNICODE
 
+    char bufa[1024], bufa2[16], bufa3[4], bufa4;
     Misc(bufa, 1024);
     Misc(bufa2, 16);
     Misc(bufa3, 4);
     Misc(&bufa4, 1);
+#endif // !VC6
 }
 
 void VsnprintfTestCase::DoMisc(