diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2004-01-28 06:46:18 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2004-01-28 06:46:18 +0000 |
| commit | a9b415468141a70708da09c74587ffef19b26f08 (patch) | |
| tree | c09cbc0ee0aef92e52e82bf9b1b1b2967fe74b0c | |
| parent | 8297869c95fc61db327c9abf699801976d3d1ddf (diff) | |
| download | ATCD-a9b415468141a70708da09c74587ffef19b26f08.tar.gz | |
ChangeLogTag: Wed Jan 28 06:46:12 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | ace/ACE.h | 8 | ||||
| -rw-r--r-- | ace/config-cygwin32.h | 6 |
2 files changed, 8 insertions, 6 deletions
diff --git a/ace/ACE.h b/ace/ACE.h index c1ca5023489..157e5d0a918 100644 --- a/ace/ACE.h +++ b/ace/ACE.h @@ -32,6 +32,14 @@ class ACE_Time_Value; class ACE_Message_Block; class ACE_Handle_Set; +#if defined (CYGWIN32) +// Include math.h. math.h defines a macro log2 that conflicts with ACE::log2() +// which seems to only cause a problem on cygwin. Insuring that math.h is +// included first solves it since we define acelog2 as log2, then +// undefines log2. +# include "ace/os_include/os_math.h" +#endif + // When log2 is defined as macro redefine it as acelog2 #if defined (log2) # define acelog2 log2 diff --git a/ace/config-cygwin32.h b/ace/config-cygwin32.h index 3b1b57e2cce..89cb0a9cf08 100644 --- a/ace/config-cygwin32.h +++ b/ace/config-cygwin32.h @@ -177,12 +177,6 @@ # define ACE_LACKS_PTHREAD_CANCEL #endif /* ACE_MT_SAFE */ -// Include math.h here so that it will be included before ACE.h. math.h defines -// a macro log2 that conflicts with ACE::log2() which seems to only cause a -// problem on cygwin. Insuring that math.h is included first solves it since -// ACE.h defines acelog2 as log2, then undefines log2. -#include "ace/os_include/os_math.h" - #include /**/ "ace/post.h" #endif /* ACE_CONFIG_CYGWIN32_H */ |