diff options
| author | olli <olli@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-01-16 16:52:09 +0000 |
|---|---|---|
| committer | olli <olli@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-01-16 16:52:09 +0000 |
| commit | b54e8b6490c56bde46e857275acabab5e8b1830b (patch) | |
| tree | 4ebe20de74a12876e5f49c7c099f1a7d8e6185fb /TAO/tao/SystemException.h | |
| parent | dc82dfddf591743b3007e0a40a279d5ab9005196 (diff) | |
| download | ATCD-b54e8b6490c56bde46e857275acabab5e8b1830b.tar.gz | |
ChangeLogTag: Mon Jan 16 16:49:27 UTC 2006 Olli Savia <ops@iki.fi>
Diffstat (limited to 'TAO/tao/SystemException.h')
| -rw-r--r-- | TAO/tao/SystemException.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/TAO/tao/SystemException.h b/TAO/tao/SystemException.h index 6a60767e525..2a343346d3a 100644 --- a/TAO/tao/SystemException.h +++ b/TAO/tao/SystemException.h @@ -34,9 +34,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 |