diff options
| author | Ulrich Drepper <drepper@gmail.com> | 2012-02-25 23:18:39 -0500 |
|---|---|---|
| committer | Ulrich Drepper <drepper@gmail.com> | 2012-02-25 23:18:39 -0500 |
| commit | 3134156779108fe8b46e0f4cd60d837572faaa93 (patch) | |
| tree | db3da5a5e28ad6c417c3d942b7ea62013c7b8646 /include/string.h | |
| parent | 7a270350a9bc3110cd5ba12bbd8c5c8c365e0032 (diff) | |
| download | glibc-3134156779108fe8b46e0f4cd60d837572faaa93.zip glibc-3134156779108fe8b46e0f4cd60d837572faaa93.tar.gz glibc-3134156779108fe8b46e0f4cd60d837572faaa93.tar.bz2 | |
First steps to get conformtest fully working
Diffstat (limited to 'include/string.h')
| -rw-r--r-- | include/string.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/string.h b/include/string.h index 0b49b8f..f1077f6 100644 --- a/include/string.h +++ b/include/string.h @@ -1,5 +1,6 @@ #ifndef _STRING_H +#ifndef _ISOMAC #include <sys/types.h> extern void *__memccpy (void *__dest, const void *__src, @@ -43,11 +44,13 @@ extern void *__memchr (const void *__s, int __c, size_t __n) extern int __ffs (int __i) __attribute__ ((const)); extern char *__strerror_r (int __errnum, char *__buf, size_t __buflen); +#endif /* Now the real definitions. We do this here since some of the functions above are defined as macros in the headers. */ #include <string/string.h> +#ifndef _ISOMAC extern __typeof (strcoll_l) __strcoll_l; extern __typeof (strxfrm_l) __strxfrm_l; extern __typeof (strcasecmp_l) __strcasecmp_l; @@ -142,5 +145,6 @@ extern char *__strcat_chk (char *__restrict __dest, extern char *__strncat_chk (char *__restrict __dest, const char *__restrict __src, size_t __len, size_t __destlen) __THROW; +#endif #endif |