From 1495b9150579208e943504ce38fbbdd6acadfa9d Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 4 May 2005 17:14:43 +0000 Subject: [PATCH] replace complicated OS tests with simple ifdef EOVERFLOW in wxString::PrintfV() git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33943 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/string.cpp | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/src/common/string.cpp b/src/common/string.cpp index 779beaee43..b626fd228f 100644 --- a/src/common/string.cpp +++ b/src/common/string.cpp @@ -1839,19 +1839,12 @@ int wxString::PrintfV(const wxChar* pszFormat, va_list argptr) // vsnprintf() may return either -1 (traditional Unix behaviour) or the // total number of characters which would have been written if the // buffer were large enough - // also, it may return an errno may be something like EILSEQ, - // in which case we need to break out + // + // and it may also set errno to EOVERFLOW apparently (which system does + // this?) if ( (len >= 0 && len <= size) - // No EOVERFLOW on Windows nor Palm 6.0 nor OpenVMS nor MacOS (not X) - // not OS/2 (not Innotek libc). -#if !defined(__WXMSW__) && \ - !defined(__WXPALMOS__) && \ - !defined(__OpenBSD__) && \ - !defined(__DJGPP__) && \ - !defined( __VMS ) && \ - !(defined(__WXMAC__) && !defined(__WXMAC_OSX__)) && \ - !(defined(__EMX__) && !defined(__INNOTEK_LIBC__)) - || errno != EOVERFLOW +#ifdef EOVERFLOW + && errno != EOVERFLOW #endif ) { -- 2.45.2