diff options
Diffstat (limited to 'ACE/ace/config-kfreebsd.h')
| -rw-r--r-- | ACE/ace/config-kfreebsd.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/ACE/ace/config-kfreebsd.h b/ACE/ace/config-kfreebsd.h index 8906ea452dc..164b06a069f 100644 --- a/ACE/ace/config-kfreebsd.h +++ b/ACE/ace/config-kfreebsd.h @@ -1,7 +1,12 @@ #ifndef ACE_CONFIG_KFREEBSD_H -#define ACE_CONFIG_KFREEBSDH -#include "ace/config-g++-common.h" +#define ACE_CONFIG_KFREEBSD_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-g++-common.h" /* Uses ctime_r & asctime_r with only two parameters vs. three. */ #define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R 1 @@ -607,7 +612,6 @@ /* Enable ACE inlining */ #define __ACE_INLINE__ 1 - -#endif /* ACE_CONFIG_KFREEBSDH */ +#endif /* ACE_CONFIG_KFREEBSD_H */ |