diff options
author | schmidt <douglascraigschmidt@users.noreply.github.com> | 2002-08-24 17:26:38 +0000 |
---|---|---|
committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 2002-08-24 17:26:38 +0000 |
commit | 38982634ced1521f5c13a790542fe094ed780be7 (patch) | |
tree | 7a384da0ca36277ff31076f15797272a63a24235 | |
parent | cda5ef4ae0b7470de14be6f9a6e27401ae77c47a (diff) | |
download | ATCD-38982634ced1521f5c13a790542fe094ed780be7.tar.gz |
ChangeLogTag:Sat Aug 24 12:01:54 2002 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu>
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | ChangeLogs/ChangeLog-03a | 4 | ||||
-rw-r--r-- | ace/OS.h | 4 |
3 files changed, 12 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index 82a9daca7bf..2727b8c984b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ Sat Aug 24 12:01:54 2002 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> + * ace/OS.h: #undef the atop macro so that it won't break the new + ACE_OS::atop() method on FreeBSD. Thanks to Russell Carter + <rcarter@pinyon.org> for this report. + * ace/config-lynxos.h: Added some #defines for LynxOS 4.0. We'll leave these comments out for now until we figure out how to add them without breaking earlier versions of LynxOS. Thanks to diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 82a9daca7bf..2727b8c984b 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,5 +1,9 @@ Sat Aug 24 12:01:54 2002 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> + * ace/OS.h: #undef the atop macro so that it won't break the new + ACE_OS::atop() method on FreeBSD. Thanks to Russell Carter + <rcarter@pinyon.org> for this report. + * ace/config-lynxos.h: Added some #defines for LynxOS 4.0. We'll leave these comments out for now until we figure out how to add them without breaking earlier versions of LynxOS. Thanks to @@ -4528,6 +4528,10 @@ public: static int atoi (const wchar_t *s); # endif /* ACE_HAS_WCHAR */ +#if defined (atop) +#undef atop +#endif /* atop */ + static void *atop (const char *s); # if defined (ACE_HAS_WCHAR) |