diff options
Diffstat (limited to 'ace/os_include/os_string.h')
| -rw-r--r-- | ace/os_include/os_string.h | 25 |
1 files changed, 22 insertions, 3 deletions
diff --git a/ace/os_include/os_string.h b/ace/os_include/os_string.h index d56a1117ca4..3f4fff3814d 100644 --- a/ace/os_include/os_string.h +++ b/ace/os_include/os_string.h @@ -26,9 +26,18 @@ #include "ace/os_include/os_stddef.h" -#if !defined (ACE_LACKS_STRING_H) -# include /**/ <string.h> -#endif /* !ACE_LACKS_STRING_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 */ // Place all additions (especially function declarations) within extern "C" {} #ifdef __cplusplus @@ -36,6 +45,16 @@ extern "C" { #endif /* __cplusplus */ + // this looks fishy... dhinton +#if !defined (ACE_HAS_STRERROR) +# if defined (ACE_HAS_SYS_ERRLIST) + extern char *sys_errlist[]; +# define strerror(err) sys_errlist[err] +# else +# define strerror(err) "strerror is unsupported" +# endif /* ACE_HAS_SYS_ERRLIST */ +#endif /* !ACE_HAS_STERROR */ + #if defined (ACE_LACKS_STRTOK_R_PROTOTYPE) && !defined (_POSIX_SOURCE) char *strtok_r (char *s, const char *delim, char **save_ptr); #endif /* ACE_LACKS_STRTOK_R_PROTOTYPE */ |