summaryrefslogtreecommitdiff
path: root/TAO/tao/SystemException.cpp
diff options
context:
space:
mode:
authorolli <olli@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2004-12-18 08:01:42 +0000
committerolli <olli@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2004-12-18 08:01:42 +0000
commit2bd0e228f29eeadcd6fd2e4c21c961e88dad4aae (patch)
tree20423237cda558f4710aa2f51a307f1012ea6e9e /TAO/tao/SystemException.cpp
parent8adbbac73c8386af41a206bc41ebaeb79fb76b09 (diff)
downloadATCD-2bd0e228f29eeadcd6fd2e4c21c961e88dad4aae.tar.gz
ChangeLogTag: Sat Dec 18 09:56:04 2004 Olli Savia <ops@iki.fi>
Diffstat (limited to 'TAO/tao/SystemException.cpp')
-rw-r--r--TAO/tao/SystemException.cpp11
1 files changed, 2 insertions, 9 deletions
diff --git a/TAO/tao/SystemException.cpp b/TAO/tao/SystemException.cpp
index f7f7651659e..8d069db2295 100644
--- a/TAO/tao/SystemException.cpp
+++ b/TAO/tao/SystemException.cpp
@@ -915,16 +915,9 @@ TAO_Exceptions::make_standard_typecode (CORBA::TypeCode_ptr &tcp,
return;
}
-#if defined (__Lynx__)
-
-// LynxOS uses macro THREAD_CANCELLED internally, so it must
-// be undefined to avoid compilation errors
-#if defined (THREAD_CANCELLED)
+#if defined (ACE_HAS_PREDEFINED_THREAD_CANCELLED_MACRO)
#undef THREAD_CANCELLED
-#endif /* THREAD_CANCELLED */
-
-#endif /*__Lynx__ */
-
+#endif /* ACE_HAS_PREDEFINED_THREAD_CANCELLED_MACRO */
// List of standard/system exceptions ... used to create static
// storage for their typecodes, then later to initialize that storage