summaryrefslogtreecommitdiff
path: root/ACE/ace/Global_Macros.h
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2021-06-18 14:49:17 +0200
committerJohnny Willemsen <jwillemsen@remedy.nl>2021-06-18 14:49:17 +0200
commit2871e2a915aaec15988365222766e5f7227603d4 (patch)
tree4e983e6dafc64b60580a6bcd23ebed352ddd1f70 /ACE/ace/Global_Macros.h
parent7a4b933220109962afd6ed72fe4e352184536e69 (diff)
downloadATCD-2871e2a915aaec15988365222766e5f7227603d4.tar.gz
No need to check for ACE_WIN32 in combination with ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS
* ACE/ace/Global_Macros.h: * ACE/ace/OS_Log_Msg_Attributes.inl: * ACE/tests/Compiler_Features_39_Test.cpp:
Diffstat (limited to 'ACE/ace/Global_Macros.h')
-rw-r--r--ACE/ace/Global_Macros.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/ACE/ace/Global_Macros.h b/ACE/ace/Global_Macros.h
index 4ce34487b4f..8918947791a 100644
--- a/ACE/ace/Global_Macros.h
+++ b/ACE/ace/Global_Macros.h
@@ -811,15 +811,15 @@ ACE_MAKE_SVC_CONFIG_FACTORY_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (AC
# define ACE_NOOP(x)
-#if defined (ACE_WIN32) && defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS)
+#if defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS)
# define ACE_SEH_TRY __try
# define ACE_SEH_EXCEPT(X) __except(X)
# define ACE_SEH_FINALLY __finally
-#else /* !ACE_WIN32 */
+#else /* !ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */
# define ACE_SEH_TRY if (1)
# define ACE_SEH_EXCEPT(X) while (0)
# define ACE_SEH_FINALLY if (1)
-#endif /* ACE_WIN32 */
+#endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */
// Handle ACE_Message_Queue.
# define ACE_SYNCH_DECL typename _ACE_SYNCH