diff options
| author | Olli Savia <ops@iki.fi> | 2009-10-29 20:31:51 +0000 |
|---|---|---|
| committer | Olli Savia <ops@iki.fi> | 2009-10-29 20:31:51 +0000 |
| commit | ab8809d6bfa8a2637cff7574a715f84b8b81ef1c (patch) | |
| tree | cb15ca3baf89fa26fd382664e0cbaf88cb6182e0 | |
| parent | fccacdfe6d620490c65edfdb26b8834ba47b2cdf (diff) | |
| download | ATCD-ab8809d6bfa8a2637cff7574a715f84b8b81ef1c.tar.gz | |
ChangeLogTag: Thu Oct 29 20:30:35 UTC 2009 Olli Savia <ops@iki.fi>
| -rw-r--r-- | ACE/ChangeLog | 5 | ||||
| -rw-r--r-- | ACE/ace/OS_NS_stdlib.h | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 34efb89256f..b1f26dd2547 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,8 @@ +Thu Oct 29 20:30:35 UTC 2009 Olli Savia <ops@iki.fi> + + * ace/OS_NS_stdlib.h: + Readded undef atop. Fixes compile error on FreeBSD. + Thu Oct 29 13:58:25 UTC 2009 Olli Savia <ops@iki.fi> * ace/OS_NS_stdlib.h: diff --git a/ACE/ace/OS_NS_stdlib.h b/ACE/ace/OS_NS_stdlib.h index e9697119429..5b278151bdc 100644 --- a/ACE/ace/OS_NS_stdlib.h +++ b/ACE/ace/OS_NS_stdlib.h @@ -48,6 +48,11 @@ extern "C" { } #endif /* ACE_WIN32 && _MSC_VER */ +// FreeBSD has atop macro (not related to ACE_OS::atop) +#if defined (atop) +# undef atop +#endif + ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE_OS { |