diff options
| author | olli <olli@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2007-05-21 13:06:48 +0000 |
|---|---|---|
| committer | olli <olli@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2007-05-21 13:06:48 +0000 |
| commit | 553942aa698b036f0de445f65902fb21097070bc (patch) | |
| tree | e1b9a2d9584ae0d78a7ac72cae66d3c0bcf281fc /ACE/ace/ACE.h | |
| parent | c2b96a02a07b201d48040e6741b45ad44d90eb1d (diff) | |
| download | ATCD-553942aa698b036f0de445f65902fb21097070bc.tar.gz | |
ChangeLogTag: Mon May 21 13:04:04 UTC 2007 Olli Savia <ops@iki.fi>
Diffstat (limited to 'ACE/ace/ACE.h')
| -rw-r--r-- | ACE/ace/ACE.h | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/ACE/ace/ACE.h b/ACE/ace/ACE.h index 7caaadbdaa2..be4737ecc41 100644 --- a/ACE/ace/ACE.h +++ b/ACE/ace/ACE.h @@ -28,6 +28,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/OS_NS_math.h" #include "ace/Flag_Manip.h" #include "ace/Handle_Ops.h" #include "ace/Lib_Find.h" @@ -35,20 +36,6 @@ #include "ace/Sock_Connect.h" #include "ace/Default_Constants.h" -#if defined (CYGWIN32) || defined (ACE_HAS_RTEMS) -// Include math.h. math.h defines a macro log2 that conflicts with ACE::log2() -// which seems to only cause a problem on cygwin and rtems. 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 -# undef log2 -#endif /* log2 */ - #if defined (ACE_EXPORT_MACRO) # undef ACE_EXPORT_MACRO #endif @@ -833,10 +820,6 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/ACE.inl" #endif /* __ACE_INLINE__ */ -#if defined (acelog2) -# define log2 acelog2 -#endif /* acelog2 */ - #include /**/ "ace/post.h" #endif /* ACE_ACE_H */ |