summaryrefslogtreecommitdiff
path: root/TAO/tao/Exception.h
diff options
context:
space:
mode:
authorbala <balanatarajan@users.noreply.github.com>2003-10-14 22:52:29 +0000
committerbala <balanatarajan@users.noreply.github.com>2003-10-14 22:52:29 +0000
commita232f69f7c89266438244e5da35284209acc1fdb (patch)
treec86aaa9284780cdf37feb97599133c1908ba8eeb /TAO/tao/Exception.h
parentf06b2f4a656ede49f6ed7255612f37c13dbc4f92 (diff)
downloadATCD-a232f69f7c89266438244e5da35284209acc1fdb.tar.gz
ChangeLog:Tue Oct 14 17:51:14 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
Diffstat (limited to 'TAO/tao/Exception.h')
-rw-r--r--TAO/tao/Exception.h10
1 files changed, 10 insertions, 0 deletions
diff --git a/TAO/tao/Exception.h b/TAO/tao/Exception.h
index 6f4b07606fc..74c22e30fa0 100644
--- a/TAO/tao/Exception.h
+++ b/TAO/tao/Exception.h
@@ -43,6 +43,16 @@ class ACE_Allocator;
class TAO_OutputCDR;
class TAO_InputCDR;
+#if defined (__Lynx__)
+
+// LynxOS uses macro THREAD_CANCELLED internally, so it must
+// be undefined to avoid compilation errors
+#if defined (THREAD_CANCELLED)
+#undef THREAD_CANCELLED
+#endif /* THREAD_CANCELLED */
+
+#endif /*__Lynx__ */
+
namespace CORBA
{
/**