X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/37513b6715f79de70b8bfa9791fedb1b3c3b9931..8e77fd8bca165aab9709649d79a7cbc6a172d4e1:/include/wx/private/wxprintf.h?ds=sidebyside diff --git a/include/wx/private/wxprintf.h b/include/wx/private/wxprintf.h index ff74ee11ca..682adfbc50 100644 --- a/include/wx/private/wxprintf.h +++ b/include/wx/private/wxprintf.h @@ -22,11 +22,6 @@ #include -#if defined(__MWERKS__) && __MSL__ >= 0x6000 -namespace std {} -using namespace std ; -#endif - // prefer snprintf over sprintf #if defined(__VISUALC__) || \ (defined(__BORLANDC__) && __BORLANDC__ >= 0x540) @@ -289,7 +284,7 @@ bool wxPrintfConvSpec::Parse(const CharType *format) CHECK_PREC m_szFlags[flagofs++] = char(ch); break; -#ifdef __WXMSW__ +#ifdef __WINDOWS__ // under Windows we support the special '%I64' notation as longlong // integer conversion specifier for MSVC compatibility // (it behaves exactly as '%lli' or '%Li' or '%qi') @@ -308,7 +303,7 @@ bool wxPrintfConvSpec::Parse(const CharType *format) break; } // else: fall-through, 'I' is MSVC equivalent of C99 'z' -#endif // __WXMSW__ +#endif // __WINDOWS__ case wxT('z'): case wxT('Z'):