From 7220e45533526e25dad0740db2e10169ba7bf62b Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Fri, 15 Apr 2005 16:47:28 +0000 Subject: [PATCH] Simpler for readable diffs in future new ports. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33628 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/bmpbase.cpp | 10 ++++++---- src/common/string.cpp | 6 +++++- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/common/bmpbase.cpp b/src/common/bmpbase.cpp index d0433e483d..1b8688c517 100644 --- a/src/common/bmpbase.cpp +++ b/src/common/bmpbase.cpp @@ -19,8 +19,11 @@ #pragma hdrstop #endif -#if defined(__WXMGL__) || defined(__WXMAC__) || defined(__WXGTK__) \ - || defined(__WXMOTIF__) || defined(__WXX11__) +#if defined(__WXMGL__) || \ + defined(__WXMAC__) || \ + defined(__WXGTK__) || \ + defined(__WXMOTIF__) || \ + defined(__WXX11__) #include "wx/setup.h" #include "wx/utils.h" @@ -122,5 +125,4 @@ public: IMPLEMENT_DYNAMIC_CLASS(wxBitmapBaseModule, wxModule) -#endif // defined(__WXMGL__) || defined(__WXMAC__) || defined(__WXCOCOA__) || defined(__WXMOTIF__) || defined(__WXX11__) - +#endif // __WXMGL__ || __WXMAC__ || __WXCOCOA__ || __WXMOTIF__ || __WXX11__ diff --git a/src/common/string.cpp b/src/common/string.cpp index 796827ec71..17c9019e5e 100644 --- a/src/common/string.cpp +++ b/src/common/string.cpp @@ -1844,7 +1844,11 @@ int wxString::PrintfV(const wxChar* pszFormat, va_list argptr) 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( __VMS ) && !(defined(__WXMAC__) && !defined(__WXMAC_OSX__)) && !(defined(__EMX__) && !defined(__INNOTEK_LIBC__)) +#if !defined(__WXMSW__) && \ + !defined(__WXPALMOS__) && \ + !defined( __VMS ) && \ + !(defined(__WXMAC__) && !defined(__WXMAC_OSX__)) && \ + !(defined(__EMX__) && !defined(__INNOTEK_LIBC__)) || errno != EOVERFLOW #endif ) -- 2.45.2