diff options
| author | Olli Savia <ops@iki.fi> | 2009-10-23 20:26:16 +0000 |
|---|---|---|
| committer | Olli Savia <ops@iki.fi> | 2009-10-23 20:26:16 +0000 |
| commit | 9d6cda2ead321a31a988dc5229a49ac9d971e8a6 (patch) | |
| tree | a1495e1d26fac02a820bf6fabd375685adb90126 | |
| parent | b9eb91ffb65ae0bd09947fb953f84a6868747182 (diff) | |
| download | ATCD-9d6cda2ead321a31a988dc5229a49ac9d971e8a6.tar.gz | |
ChangeLogTag: Fri Oct 23 20:25:13 UTC 2009 Olli Savia <ops@iki.fi>
| -rw-r--r-- | ACE/ChangeLog | 5 | ||||
| -rw-r--r-- | ACE/ace/os_include/os_string.h | 16 |
2 files changed, 9 insertions, 12 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 9f77b758777..b5392a3e832 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,8 @@ +Fri Oct 23 20:25:13 UTC 2009 Olli Savia <ops@iki.fi> + + * ace/os_include/os_string.h: + Removed some legacy code. + Fri Oct 23 13:58:45 UTC 2009 Olli Savia <ops@iki.fi> * tests/run_test.lst: diff --git a/ACE/ace/os_include/os_string.h b/ACE/ace/os_include/os_string.h index 994d9940940..afd671e5123 100644 --- a/ACE/ace/os_include/os_string.h +++ b/ACE/ace/os_include/os_string.h @@ -26,18 +26,10 @@ #include "ace/os_include/os_stddef.h" -// Matthew Stevens 7-10-95 Fix GNU GCC 2.7 for memchr() problem. -#if defined (ACE_HAS_GNU_CSTRING_H) -// Define this file to keep /usr/include/memory.h from being included. -# include /**/ <cstring> -#else -# if !defined (ACE_LACKS_MEMORY_H) -# include /**/ <memory.h> -# endif /* !ACE_LACKS_MEMORY_H */ -# if !defined (ACE_LACKS_STRING_H) -# include /**/ <string.h> -# endif /* !ACE_LACKS_STRING_H */ -#endif /* ACE_HAS_GNU_CSTRING_H */ +#if !defined (ACE_LACKS_STRING_H) +# include /**/ <string.h> +#endif /* !ACE_LACKS_STRING_H */ + // Place all additions (especially function declarations) within extern "C" {} #ifdef __cplusplus |