diff options
| author | Olli Savia <ops@iki.fi> | 2014-12-19 00:28:31 +0200 |
|---|---|---|
| committer | Olli Savia <ops@iki.fi> | 2014-12-19 00:28:31 +0200 |
| commit | 2c79817583b064c2ba223bf9d01cae5e4824546e (patch) | |
| tree | 89adc76f785d88c463a7e3027ab0464e37999851 /ACE | |
| parent | 92ee48d432a8d9a0d9a6081248a02cef210d5ea1 (diff) | |
| download | ATCD-2c79817583b064c2ba223bf9d01cae5e4824546e.tar.gz | |
Moved FreeBSD specific settings from OS_NS_stdlib.h to config-freebsd.h
Diffstat (limited to 'ACE')
| -rw-r--r-- | ACE/ace/OS_NS_stdlib.h | 5 | ||||
| -rw-r--r-- | ACE/ace/config-freebsd.h | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/ACE/ace/OS_NS_stdlib.h b/ACE/ace/OS_NS_stdlib.h index e4f18ea5e8b..8b2f9913423 100644 --- a/ACE/ace/OS_NS_stdlib.h +++ b/ACE/ace/OS_NS_stdlib.h @@ -48,11 +48,6 @@ extern "C" { } #endif /* ACE_WIN32 && _MSC_VER */ -// FreeBSD has atop macro (not related to ACE_OS::atop) -#if defined (atop) -# undef atop -#endif - /* * We inline and undef some functions that may be implemented * as macros on some platforms. This way macro definitions will diff --git a/ACE/ace/config-freebsd.h b/ACE/ace/config-freebsd.h index bd08937b112..7f6e36f0aa2 100644 --- a/ACE/ace/config-freebsd.h +++ b/ACE/ace/config-freebsd.h @@ -14,6 +14,11 @@ // Make sure we source in the OS version. #include <osreldate.h> +// Make sure system defined macro (not related to ACE_OS::atop) +// is not defined during ACE compilation +#include <machine/param.h> +#undef atop + #include "ace/config-posix.h" #include "ace/config-g++-common.h" |