From 58187c862cf9d22919d2d672a17a33bdf9548aba Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 18 Jan 2005 13:11:24 +0000 Subject: [PATCH] only define globals when wxUSE_BASE to avoid duplicate definitions in wxBase and wxMSW (closes 1104289) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31449 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/msw/main.cpp b/src/msw/main.cpp index 89c330a35d..900ef4fdef 100644 --- a/src/msw/main.cpp +++ b/src/msw/main.cpp @@ -69,7 +69,7 @@ // wrap real wxEntry in a try-except block to be able to call // OnFatalException() if necessary -#if wxUSE_ON_FATAL_EXCEPTION +#if wxUSE_ON_FATAL_EXCEPTION && wxUSE_BASE // global pointer to exception information, only valid inside OnFatalException, // used by wxStackWalker and wxCrashReport @@ -191,7 +191,7 @@ int wxEntry(int& argc, wxChar **argv) } } -#endif // wxUSE_ON_FATAL_EXCEPTION +#endif // wxUSE_ON_FATAL_EXCEPTION && wxUSE_BASE #if wxUSE_GUI -- 2.47.2