From 764b624e32e0e9cf719acc3773f41d9e8873f20d Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 30 Sep 2006 11:38:48 +0000 Subject: [PATCH] don't redefine HAVE_BROKEN_SWPRINTF_DECL/HAVE_SWPRINTF if they're already defined as it happens when using configure under MSW git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41523 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/wxchar.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/common/wxchar.cpp b/src/common/wxchar.cpp index f8c44d1361..e1d69caae7 100644 --- a/src/common/wxchar.cpp +++ b/src/common/wxchar.cpp @@ -196,7 +196,7 @@ bool WXDLLEXPORT wxOKlibc() // implemented later in this file using wxVsnprintf() and that would // result in an endless recursion and thus in a stack overflow #if wxUSE_UNICODE - #if defined(__WINDOWS__) + #if defined(__WINDOWS__) && !defined(HAVE_SWPRINTF) // all compilers under Windows should have swprintf() #define HAVE_SWPRINTF #endif @@ -209,7 +209,9 @@ bool WXDLLEXPORT wxOKlibc() (defined(__VISUALC__) && __VISUALC__ < 1400) || \ defined(__GNUWIN32__) || \ defined(__BORLANDC__) - #define HAVE_BROKEN_SWPRINTF_DECL + #ifndef HAVE_BROKEN_SWPRINTF_DECL + #define HAVE_BROKEN_SWPRINTF_DECL + #endif #endif // problem: on some systems swprintf takes the 'max' argument while on -- 2.47.2