From 5689f53cdca12113d7b9edcd54d0c76e1a9641bf Mon Sep 17 00:00:00 2001 From: Olli Savia Date: Mon, 16 Jan 2006 16:52:09 +0000 Subject: ChangeLogTag: Mon Jan 16 16:49:27 UTC 2006 Olli Savia --- TAO/tao/Exception.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'TAO/tao/Exception.h') diff --git a/TAO/tao/Exception.h b/TAO/tao/Exception.h index 3d6a605bdab..fbf2a092fd8 100644 --- a/TAO/tao/Exception.h +++ b/TAO/tao/Exception.h @@ -48,9 +48,9 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_OutputCDR; class TAO_InputCDR; -#if defined (ACE_HAS_PREDEFINED_THREAD_CANCELLED_MACRO) +#if defined (THREAD_CANCELLED) #undef THREAD_CANCELLED -#endif /* ACE_HAS_PREDEFINED_THREAD_CANCELLED_MACRO */ +#endif /* THREAD_CANCELLED */ // This is already done in orbconf.h. But this file is totally // decoupled from its contents that we have to do this here. Including -- cgit v1.2.1