X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/39ea2103cdaadd61974b9746cac2315183ef6720..f0bb342fedc107ce872e9c587322254ac4dd005a:/include/wx/msw/seh.h?ds=sidebyside

diff --git a/include/wx/msw/seh.h b/include/wx/msw/seh.h
index b9d26b7b67..edcefb8fd3 100644
--- a/include/wx/msw/seh.h
+++ b/include/wx/msw/seh.h
@@ -19,7 +19,7 @@
     extern unsigned long wxGlobalSEHandler(EXCEPTION_POINTERS *pExcPtrs);
 
     // helper macro for wxSEH_HANDLE
-#if defined(__VISUALC__) && (__VISUALC__ <= 1200)
+#if defined(__BORLANDC__) || (defined(__VISUALC__) && (__VISUALC__ <= 1200))
     // some compilers don't understand that this code is unreachable and warn
     // about no value being returned from the function without it, so calm them
     // down
@@ -47,7 +47,7 @@
     #define wxSEH_HANDLE(rc)
 #endif // wxUSE_ON_FATAL_EXCEPTION
 
-#if defined(__VISUALC__) && !defined(__WXWINCE__)
+#if wxUSE_ON_FATAL_EXCEPTION && defined(__VISUALC__) && !defined(__WXWINCE__)
     #include <eh.h>
 
     // C++ exception to structured exceptions translator: we need it in order