From: Vadim Zeitlin Date: Sun, 23 Sep 2007 00:20:35 +0000 (+0000) Subject: don't define wxCRT_xxprintfW function if the corresponding xxprintfw() standard funct... X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/fc1f568e2377b374346631701989dbd73bd6307f don't define wxCRT_xxprintfW function if the corresponding xxprintfw() standard functions are not available git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48909 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/wxcrtvararg.h b/include/wx/wxcrtvararg.h index 8585479dd6..272bbcf85e 100644 --- a/include/wx/wxcrtvararg.h +++ b/include/wx/wxcrtvararg.h @@ -179,16 +179,6 @@ #define wxCRT_VprintfA vprintf #define wxCRT_VsprintfA vsprintf -#define wxCRT_FprintfW fwprintf -#define wxCRT_PrintfW wprintf -#define wxCRT_VfprintfW vfwprintf -#define wxCRT_VprintfW vwprintf - -#if defined(__WINDOWS__) && !defined(HAVE_VSWPRINTF) -// only non-standard vswprintf() without buffer size argument can be used here -#define wxCRT_VsprintfW vswprintf -#endif - /* In Unicode mode we need to have all standard functions such as wprintf() and so on but not all systems have them so use our own implementations in this @@ -210,6 +200,16 @@ int wxCRT_VfprintfW( FILE *stream, const wchar_t *format, va_list ap ); int wxCRT_VprintfW( const wchar_t *format, va_list ap ); int wxCRT_VsprintfW( wchar_t *str, const wchar_t *format, va_list ap ); +#else /* !wxNEED_WPRINTF */ + #define wxCRT_FprintfW fwprintf + #define wxCRT_PrintfW wprintf + #define wxCRT_VfprintfW vfwprintf + #define wxCRT_VprintfW vwprintf + + #if defined(__WINDOWS__) && !defined(HAVE_VSWPRINTF) + // only non-standard vswprintf() without buffer size argument can be used here + #define wxCRT_VsprintfW vswprintf + #endif #endif /* wxNEED_WPRINTF */