]> git.saurik.com Git - wxWidgets.git/commitdiff
Don't redefine wxNO_EXCEPTIONS in wx/except.h if it's already defined.
authorVadim Zeitlin <vadim@wxwidgets.org>
Sat, 17 Jul 2010 11:55:10 +0000 (11:55 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Sat, 17 Jul 2010 11:55:10 +0000 (11:55 +0000)
This symbol can be defined on compiler command line already, don't redefine it
in this case to avoid a warning.

Closes #12235.

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

include/wx/except.h

index e63d4f97814c91c7682138984b7c386c9a7aa5c8..116a82efbc444bedbab2eaf73fe07889e0cd2d65 100644 (file)
@@ -24,7 +24,9 @@
 // compilation errors in e.g. wx/scopeguard.h with at least g++ 4
 #if !wxUSE_EXCEPTIONS || \
         (defined(__GNUG__) && !defined(__EXCEPTIONS))
-    #define wxNO_EXCEPTIONS
+    #ifndef wxNO_EXCEPTIONS
+        #define wxNO_EXCEPTIONS
+    #endif
 #endif
 
 #ifdef wxNO_EXCEPTIONS