From d886c20e225d3d48f767e4590ae825270661dcb3 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 17 Jul 2010 11:55:10 +0000 Subject: [PATCH] Don't redefine wxNO_EXCEPTIONS in wx/except.h if it's already defined. 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 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/wx/except.h b/include/wx/except.h index e63d4f9781..116a82efbc 100644 --- a/include/wx/except.h +++ b/include/wx/except.h @@ -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 -- 2.47.2