don't redefine HAVE_BROKEN_SWPRINTF_DECL/HAVE_SWPRINTF if they're already defined...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41523 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/wxchar.cpp b/src/common/wxchar.cpp
index f8c44d136151fa2830d7b3720d949650159f63d1..e1d69caae73560591797c2c663353d0fdb7b9d89 100644 (file)
--- 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
 //     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
         // 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__)
         (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
     #endif
 
     // problem: on some systems swprintf takes the 'max' argument while on