diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/libc-symbols.h | 93 | ||||
| -rw-r--r-- | include/string.h | 163 | ||||
| -rw-r--r-- | include/strings.h | 4 |
3 files changed, 215 insertions, 45 deletions
diff --git a/include/libc-symbols.h b/include/libc-symbols.h index 6e9c5c9f0..e491aff5f 100644 --- a/include/libc-symbols.h +++ b/include/libc-symbols.h @@ -22,6 +22,16 @@ #ifndef _LIBC_SYMBOLS_H #define _LIBC_SYMBOLS_H 1 +/* This is defined for the compilation of all C library code. features.h + tests this to avoid inclusion of stubs.h while compiling the library, + before stubs.h has been generated. Some library code that is shared + with other packages also tests this symbol to see if it is being + compiled as part of the C library. We must define this before including + config.h, because it makes some definitions conditional on whether libc + itself is being compiled, or just some generator program. */ +#define _LIBC 1 + + /* This file's macros are included implicitly in the compilation of every file in the C library by -imacros. @@ -40,21 +50,11 @@ #include <bits/uClibc_arch_features.h> - -/* This is defined for the compilation of all C library code. features.h - tests this to avoid inclusion of stubs.h while compiling the library, - before stubs.h has been generated. Some library code that is shared - with other packages also tests this symbol to see if it is being - compiled as part of the C library. We must define this before including - config.h, because it makes some definitions conditional on whether libc - itself is being compiled, or just some generator program. */ -#define _LIBC 1 - /* Enable declarations of GNU extensions, since we are compiling them. */ #define _GNU_SOURCE 1 /* Prepare for the case that `__builtin_expect' is not available. */ -#if __GNUC__ == 2 && __GNUC_MINOR__ < 96 +#if defined __GNUC__ && __GNUC__ == 2 && __GNUC_MINOR__ < 96 # define __builtin_expect(x, expected_value) (x) #endif #ifndef likely @@ -72,7 +72,7 @@ #define attribute_unused __attribute__ ((unused)) -#ifdef __GNUC__ +#if defined __GNUC__ || defined __ICC # define attribute_noreturn __attribute__ ((__noreturn__)) #else # define attribute_noreturn @@ -82,12 +82,6 @@ # define IS_IN_libc 1 #endif -#ifdef __UCLIBC_NO_UNDERSCORES__ -# define NO_UNDERSCORES -#else -# undef NO_UNDERSCORES -#endif - #ifdef __UCLIBC_HAVE_ASM_SET_DIRECTIVE__ # define HAVE_ASM_SET_DIRECTIVE #else @@ -124,14 +118,16 @@ #undef C_SYMBOL_NAME #ifndef C_SYMBOL_NAME -# ifdef NO_UNDERSCORES +# ifndef __UCLIBC_UNDERSCORES__ # define C_SYMBOL_NAME(name) name # else # define C_SYMBOL_NAME(name) _##name # endif #endif -#ifndef ASM_LINE_SEP +#ifdef __UCLIBC_ASM_LINE_SEP__ +# define ASM_LINE_SEP __UCLIBC_ASM_LINE_SEP__ +#else # define ASM_LINE_SEP ; #endif @@ -174,9 +170,6 @@ # else -# define weak_function /* empty */ -# define weak_const_function /* empty */ - # define weak_alias(name, aliasname) strong_alias(name, aliasname) # define weak_extern(symbol) /* Nothing. */ @@ -246,17 +239,17 @@ .set C_SYMBOL_NAME (alias), C_SYMBOL_NAME (original) # endif # else /* ! HAVE_ASM_SET_DIRECTIVE */ -# ifdef HAVE_ASM_GLOBAL_DOT_NAME -# define weak_alias(original, alias) \ +# ifdef HAVE_ASM_GLOBAL_DOT_NAME +# define weak_alias(original, alias) \ .weak C_SYMBOL_NAME (alias) ASM_LINE_SEP \ C_SYMBOL_NAME (alias) = C_SYMBOL_NAME (original) ASM_LINE_SEP \ .weak C_SYMBOL_DOT_NAME (alias) ASM_LINE_SEP \ C_SYMBOL_DOT_NAME (alias) = C_SYMBOL_DOT_NAME (original) -# else -# define weak_alias(original, alias) \ +# else +# define weak_alias(original, alias) \ .weak C_SYMBOL_NAME (alias) ASM_LINE_SEP \ C_SYMBOL_NAME (alias) = C_SYMBOL_NAME (original) -# endif +# endif # endif # define weak_extern(symbol) \ .weak C_SYMBOL_NAME (symbol) @@ -282,25 +275,21 @@ #define __make_section_unallocated(section_string) \ __asm__ (".section " section_string "\n\t.previous"); -/* Tacking on "\n\t#" to the section name makes gcc put it's bogus +/* Tacking on "\n#APP\n\t#" to the section name makes gcc put it's bogus section attributes on what looks like a comment to the assembler. */ #ifdef __sparc__ //HAVE_SECTION_QUOTES -# define __sec_comment "\"\n\t#\"" +# define __sec_comment "\"\n#APP\n\t#\"" #else -# define __sec_comment "\n\t#" +# define __sec_comment "\n#APP\n\t#" #endif /* When a reference to SYMBOL is encountered, the linker will emit a warning message MSG. */ -#if defined(__cris__) || defined(__vax__) -# define link_warning(symbol, msg) -#else -# define link_warning(symbol, msg) \ +#define link_warning(symbol, msg) \ __make_section_unallocated (".gnu.warning." #symbol) \ static const char __evoke_link_warning_##symbol[] \ __attribute__ ((used, section (".gnu.warning." #symbol __sec_comment))) \ = msg; -#endif /* Handling on non-exported internal names. We have to do this only for shared code. */ @@ -414,8 +403,9 @@ * d. hidden_def() in asm is _hidden_strong_alias (not strong_alias) */ /* Arrange to hide uClibc internals */ -#if defined __GNUC__ && defined __GNUC_MINOR__ && \ - ( __GNUC__ >= 3 && __GNUC_MINOR__ >= 3 ) || __GNUC__ >= 4 +#if (defined __GNUC__ && \ + (defined __GNUC_MINOR__ && ( __GNUC__ >= 3 && __GNUC_MINOR__ >= 3 ) \ + || __GNUC__ >= 4)) || defined __ICC # define attribute_hidden __attribute__ ((visibility ("hidden"))) # define __hidden_proto_hiddenattr(attrs...) __attribute__ ((visibility ("hidden"), ##attrs)) #else @@ -423,7 +413,7 @@ # define __hidden_proto_hiddenattr(attrs...) #endif -#if !defined STATIC && !defined __BCC__ +#if /*!defined STATIC &&*/ !defined __BCC__ # ifndef __ASSEMBLER__ # define hidden_proto(name, attrs...) __hidden_proto (name, __GI_##name, ##attrs) # define __hidden_proto(name, internal, attrs...) \ @@ -435,9 +425,12 @@ # define __hidden_ver1(local, internal, name) \ extern __typeof (name) __EI_##name __asm__(__hidden_asmname (#internal)); \ extern __typeof (name) __EI_##name __attribute__((alias (__hidden_asmname1 (,#local)))) +# define hidden_ver(local, name) __hidden_ver1(local, __GI_##name, name); +# define hidden_data_ver(local, name) hidden_ver(local, name) # define hidden_def(name) __hidden_ver1(__GI_##name, name, name); # define hidden_data_def(name) hidden_def(name) -# define hidden_weak(name) __hidden_ver1(__GI_##name, name, name) __attribute__((weak)); +# define hidden_weak(name) \ + __hidden_ver1(__GI_##name, name, name) __attribute__((weak)); # define hidden_data_weak(name) hidden_weak(name) # else /* __ASSEMBLER__ */ @@ -494,26 +487,36 @@ hidden_proto doesn't make sense for assembly but the equivalent is to call via the HIDDEN_JUMPTARGET macro instead of JUMPTARGET. */ # define hidden_def(name) _hidden_strong_alias (name, __GI_##name) -# define hidden_data_def(name) _hidden_strong_alias (name, __GI_##name) # define hidden_weak(name) _hidden_weak_alias (name, __GI_##name) +# define hidden_ver(local, name) strong_alias (local, __GI_##name) +# define hidden_data_def(name) _hidden_strong_alias (name, __GI_##name) # define hidden_data_weak(name) _hidden_weak_alias (name, __GI_##name) -# define HIDDEN_JUMPTARGET(name) __GI_##name +# define hidden_data_ver(local, name) strong_data_alias (local, __GI_##name) +# ifdef HAVE_ASM_GLOBAL_DOT_NAME +# define HIDDEN_JUMPTARGET(name) .__GI_##name +# else +# define HIDDEN_JUMPTARGET(name) __GI_##name +# endif # endif /* __ASSEMBLER__ */ #else /* SHARED */ # ifndef __ASSEMBLER__ # define hidden_proto(name, attrs...) # else # define HIDDEN_JUMPTARGET(name) name -# endif -# define hidden_def(name) -# define hidden_data_def(name) +# endif /* Not __ASSEMBLER__ */ # define hidden_weak(name) +# define hidden_def(name) +# define hidden_ver(local, name) # define hidden_data_weak(name) +# define hidden_data_def(name) +# define hidden_data_ver(local, name) #endif /* SHARED */ /* uClibc does not support versioning yet. */ #define versioned_symbol(lib, local, symbol, version) /* weak_alias(local, symbol) */ +#undef hidden_ver #define hidden_ver(local, name) /* strong_alias(local, __GI_##name) */ +#undef hidden_data_ver #define hidden_data_ver(local, name) /* strong_alias(local,__GI_##name) */ #if !defined NOT_IN_libc diff --git a/include/string.h b/include/string.h index 87d953449..35807d6a7 100644 --- a/include/string.h +++ b/include/string.h @@ -38,10 +38,12 @@ __BEGIN_NAMESPACE_STD extern void *memcpy (void *__restrict __dest, __const void *__restrict __src, size_t __n) __THROW __nonnull ((1, 2)); +libc_hidden_proto(memcpy) /* Copy N bytes of SRC to DEST, guaranteeing correct behavior for overlapping strings. */ extern void *memmove (void *__dest, __const void *__src, size_t __n) __THROW __nonnull ((1, 2)); +libc_hidden_proto(memmove) __END_NAMESPACE_STD /* Copy no more than N bytes of SRC to DEST, stopping when C is found. @@ -51,20 +53,24 @@ __END_NAMESPACE_STD extern void *memccpy (void *__restrict __dest, __const void *__restrict __src, int __c, size_t __n) __THROW __nonnull ((1, 2)); +libc_hidden_proto(memccpy) #endif /* SVID. */ __BEGIN_NAMESPACE_STD /* Set N bytes of S to C. */ extern void *memset (void *__s, int __c, size_t __n) __THROW __nonnull ((1)); +libc_hidden_proto(memset) /* Compare N bytes of S1 and S2. */ extern int memcmp (__const void *__s1, __const void *__s2, size_t __n) __THROW __attribute_pure__ __nonnull ((1, 2)); +libc_hidden_proto(memcmp) /* Search N bytes of S for C. */ extern void *memchr (__const void *__s, int __c, size_t __n) __THROW __attribute_pure__ __nonnull ((1)); +libc_hidden_proto(memchr) __END_NAMESPACE_STD #ifdef __USE_GNU @@ -72,10 +78,12 @@ __END_NAMESPACE_STD length limit. */ extern void *rawmemchr (__const void *__s, int __c) __THROW __attribute_pure__ __nonnull ((1)); +libc_hidden_proto(rawmemchr) /* Search N bytes of S for the final occurrence of C. */ extern void *memrchr (__const void *__s, int __c, size_t __n) __THROW __attribute_pure__ __nonnull ((1)); +libc_hidden_proto(memrchr) #endif @@ -83,32 +91,40 @@ __BEGIN_NAMESPACE_STD /* Copy SRC to DEST. */ extern char *strcpy (char *__restrict __dest, __const char *__restrict __src) __THROW __nonnull ((1, 2)); +libc_hidden_proto(strcpy) /* Copy no more than N characters of SRC to DEST. */ extern char *strncpy (char *__restrict __dest, __const char *__restrict __src, size_t __n) __THROW __nonnull ((1, 2)); +libc_hidden_proto(strncpy) /* Append SRC onto DEST. */ extern char *strcat (char *__restrict __dest, __const char *__restrict __src) __THROW __nonnull ((1, 2)); +libc_hidden_proto(strcat) /* Append no more than N characters from SRC onto DEST. */ extern char *strncat (char *__restrict __dest, __const char *__restrict __src, size_t __n) __THROW __nonnull ((1, 2)); +libc_hidden_proto(strncat) /* Compare S1 and S2. */ extern int strcmp (__const char *__s1, __const char *__s2) __THROW __attribute_pure__ __nonnull ((1, 2)); +libc_hidden_proto(strcmp) /* Compare N characters of S1 and S2. */ extern int strncmp (__const char *__s1, __const char *__s2, size_t __n) __THROW __attribute_pure__ __nonnull ((1, 2)); +libc_hidden_proto(strncmp) /* Compare the collated forms of S1 and S2. */ extern int strcoll (__const char *__s1, __const char *__s2) __THROW __attribute_pure__ __nonnull ((1, 2)); +libc_hidden_proto(strcoll) /* Put a transformation of SRC into no more than N bytes of DEST. */ extern size_t strxfrm (char *__restrict __dest, __const char *__restrict __src, size_t __n) __THROW __nonnull ((2)); +libc_hidden_proto(strxfrm) __END_NAMESPACE_STD #if defined __USE_GNU && defined __UCLIBC_HAS_XLOCALE__ @@ -120,15 +136,18 @@ __END_NAMESPACE_STD /* Compare the collated forms of S1 and S2 using rules from L. */ extern int strcoll_l (__const char *__s1, __const char *__s2, __locale_t __l) __THROW __attribute_pure__ __nonnull ((1, 2, 3)); +libc_hidden_proto(strcoll_l) /* Put a transformation of SRC into no more than N bytes of DEST. */ extern size_t strxfrm_l (char *__dest, __const char *__src, size_t __n, __locale_t __l) __THROW __nonnull ((2, 4)); +libc_hidden_proto(strxfrm_l) #endif #if defined __USE_SVID || defined __USE_BSD || defined __USE_XOPEN_EXTENDED /* Duplicate S, returning an identical malloc'd string. */ extern char *strdup (__const char *__s) __THROW __attribute_malloc__ __nonnull ((1)); +libc_hidden_proto(strdup) #endif /* Return a malloc'd copy of at most N bytes of STRING. The @@ -137,6 +156,7 @@ extern char *strdup (__const char *__s) #if defined __USE_GNU extern char *strndup (__const char *__string, size_t __n) __THROW __attribute_malloc__ __nonnull ((1)); +libc_hidden_proto(strndup) #endif #if defined __USE_GNU && defined __GNUC__ @@ -166,9 +186,11 @@ __BEGIN_NAMESPACE_STD /* Find the first occurrence of C in S. */ extern char *strchr (__const char *__s, int __c) __THROW __attribute_pure__ __nonnull ((1)); +libc_hidden_proto(strchr) /* Find the last occurrence of C in S. */ extern char *strrchr (__const char *__s, int __c) __THROW __attribute_pure__ __nonnull ((1)); +libc_hidden_proto(strrchr) __END_NAMESPACE_STD #ifdef __USE_GNU @@ -176,6 +198,7 @@ __END_NAMESPACE_STD the closing NUL byte in case C is not found in S. */ extern char *strchrnul (__const char *__s, int __c) __THROW __attribute_pure__ __nonnull ((1)); +libc_hidden_proto(strchrnul) #endif __BEGIN_NAMESPACE_STD @@ -183,21 +206,26 @@ __BEGIN_NAMESPACE_STD consists entirely of characters not in REJECT. */ extern size_t strcspn (__const char *__s, __const char *__reject) __THROW __attribute_pure__ __nonnull ((1, 2)); +libc_hidden_proto(strcspn) /* Return the length of the initial segment of S which consists entirely of characters in ACCEPT. */ extern size_t strspn (__const char *__s, __const char *__accept) __THROW __attribute_pure__ __nonnull ((1, 2)); +libc_hidden_proto(strspn) /* Find the first occurrence in S of any character in ACCEPT. */ extern char *strpbrk (__const char *__s, __const char *__accept) __THROW __attribute_pure__ __nonnull ((1, 2)); +libc_hidden_proto(strpbrk) /* Find the first occurrence of NEEDLE in HAYSTACK. */ extern char *strstr (__const char *__haystack, __const char *__needle) __THROW __attribute_pure__ __nonnull ((1, 2)); +libc_hidden_proto(strstr) /* Divide S into tokens separated by characters in DELIM. */ extern char *strtok (char *__restrict __s, __const char *__restrict __delim) __THROW __nonnull ((2)); +libc_hidden_proto(strtok) __END_NAMESPACE_STD /* Divide S into tokens separated by characters in DELIM. Information @@ -212,12 +240,14 @@ extern char *__strtok_r (char *__restrict __s, extern char *strtok_r (char *__restrict __s, __const char *__restrict __delim, char **__restrict __save_ptr) __THROW __nonnull ((2, 3)); +libc_hidden_proto(strtok_r) #endif #ifdef __USE_GNU /* Similar to `strstr' but this function ignores the case of both strings. */ extern char *strcasestr (__const char *__haystack, __const char *__needle) __THROW __attribute_pure__ __nonnull ((1, 2)); +libc_hidden_proto(strcasestr) #endif #ifdef __USE_GNU @@ -227,6 +257,7 @@ extern char *strcasestr (__const char *__haystack, __const char *__needle) extern void *memmem (__const void *__haystack, size_t __haystacklen, __const void *__needle, size_t __needlelen) __THROW __attribute_pure__ __nonnull ((1, 3)); +libc_hidden_proto(memmem) /* Copy N bytes of SRC to DEST, return pointer to bytes after the last written byte. */ @@ -238,6 +269,7 @@ extern void *__mempcpy (void *__restrict __dest, extern void *mempcpy (void *__restrict __dest, __const void *__restrict __src, size_t __n) __THROW __nonnull ((1, 2)); +libc_hidden_proto(mempcpy) #endif @@ -245,6 +277,7 @@ __BEGIN_NAMESPACE_STD /* Return the length of S. */ extern size_t strlen (__const char *__s) __THROW __attribute_pure__ __nonnull ((1)); +libc_hidden_proto(strlen) __END_NAMESPACE_STD #ifdef __USE_GNU @@ -252,12 +285,14 @@ __END_NAMESPACE_STD If no '\0' terminator is found in that many characters, return MAXLEN. */ extern size_t strnlen (__const char *__string, size_t __maxlen) __THROW __attribute_pure__ __nonnull ((1)); +libc_hidden_proto(strnlen) #endif __BEGIN_NAMESPACE_STD /* Return a string describing the meaning of the `errno' code in ERRNUM. */ extern char *strerror (int __errnum) __THROW; +libc_hidden_proto(strerror) __END_NAMESPACE_STD #if defined __USE_XOPEN2K || defined __USE_MISC /* Reentrant version of `strerror'. @@ -337,6 +372,7 @@ extern char *rindex (__const char *__s, int __c) /* Return the position of the first bit set in I, or 0 if none are set. The least-significant bit is position 1, the most-significant 32. */ extern int ffs (int __i) __THROW __attribute__ ((__const__)); +libc_hidden_proto(ffs) /* The following two functions are non-standard but necessary for non-32 bit platforms. */ @@ -351,10 +387,12 @@ __extension__ extern int ffsll (long long int __ll) /* Compare S1 and S2, ignoring case. */ extern int strcasecmp (__const char *__s1, __const char *__s2) __THROW __attribute_pure__ __nonnull ((1, 2)); +libc_hidden_proto(strcasecmp) /* Compare no more than N chars of S1 and S2, ignoring case. */ extern int strncasecmp (__const char *__s1, __const char *__s2, size_t __n) __THROW __attribute_pure__ __nonnull ((1, 2)); +libc_hidden_proto(strncasecmp) #endif /* Use BSD. */ #if defined __USE_GNU && defined __UCLIBC_HAS_XLOCALE__ @@ -363,10 +401,12 @@ extern int strncasecmp (__const char *__s1, __const char *__s2, size_t __n) extern int strcasecmp_l (__const char *__s1, __const char *__s2, __locale_t __loc) __THROW __attribute_pure__ __nonnull ((1, 2, 3)); +libc_hidden_proto(strcasecmp_l) extern int strncasecmp_l (__const char *__s1, __const char *__s2, size_t __n, __locale_t __loc) __THROW __attribute_pure__ __nonnull ((1, 2, 4)); +libc_hidden_proto(strncasecmp_l) #endif #ifdef __USE_BSD @@ -375,6 +415,7 @@ extern int strncasecmp_l (__const char *__s1, __const char *__s2, extern char *strsep (char **__restrict __stringp, __const char *__restrict __delim) __THROW __nonnull ((1, 2)); +libc_hidden_proto(strsep) #endif #ifdef __USE_GNU @@ -382,10 +423,12 @@ extern char *strsep (char **__restrict __stringp, #if 0 extern int strverscmp (__const char *__s1, __const char *__s2) __THROW __attribute_pure__ __nonnull ((1, 2)); +libc_hidden_proto(strverscmp) #endif /* Return a string describing the meaning of the signal number in SIG. */ extern char *strsignal (int __sig) __THROW; +libc_hidden_proto(strsignal) /* Copy SRC to DEST, returning the address of the terminating '\0' in DEST. */ #if 0 /* uClibc: disabled */ @@ -394,6 +437,7 @@ extern char *__stpcpy (char *__restrict __dest, __const char *__restrict __src) #endif extern char *stpcpy (char *__restrict __dest, __const char *__restrict __src) __THROW __nonnull ((1, 2)); +libc_hidden_proto(stpcpy) /* Copy no more than N characters of SRC to DEST, returning the address of the last character written into DEST. */ @@ -405,6 +449,7 @@ extern char *__stpncpy (char *__restrict __dest, extern char *stpncpy (char *__restrict __dest, __const char *__restrict __src, size_t __n) __THROW __nonnull ((1, 2)); +libc_hidden_proto(stpncpy) #if 0 /* uClibc does not support strfry or memfrob. */ /* Sautee STRING briskly. */ @@ -420,6 +465,7 @@ extern void *memfrob (void *__s, size_t __n) __THROW __nonnull ((1)); in <libgen.h>) which makes the XPG version of this function available. */ extern char *basename (__const char *__filename) __THROW __nonnull ((1)); +libc_hidden_proto(basename) # endif #endif @@ -428,10 +474,127 @@ extern char *basename (__const char *__filename) __THROW __nonnull ((1)); /* Two OpenBSD extension functions. */ extern size_t strlcat(char *__restrict dst, const char *__restrict src, size_t n) __THROW __nonnull ((1, 2)); +libc_hidden_proto(strlcat) extern size_t strlcpy(char *__restrict dst, const char *__restrict src, size_t n) __THROW __nonnull ((1, 2)); +libc_hidden_proto(strlcpy) #endif __END_DECLS +#ifdef UCLIBC_INTERNAL +/* In the same order and with the same defines */ +libc_hidden_proto(memcpy) +libc_hidden_proto(memmove) +#if defined __USE_SVID || defined __USE_BSD || defined __USE_XOPEN +libc_hidden_proto(memccpy) +#endif /* SVID. */ +libc_hidden_proto(memset) +libc_hidden_proto(memcmp) +libc_hidden_proto(memchr) +#ifdef __USE_GNU +libc_hidden_proto(rawmemchr) +libc_hidden_proto(memrchr) +#endif +libc_hidden_proto(strcpy) +libc_hidden_proto(strncpy) +libc_hidden_proto(strcat) +libc_hidden_proto(strncat) +libc_hidden_proto(strcmp) +libc_hidden_proto(strncmp) +libc_hidden_proto(strcoll) +libc_hidden_proto(strxfrm) +#if defined __USE_GNU && defined __UCLIBC_HAS_XLOCALE__ +libc_hidden_proto(strcoll_l) +libc_hidden_proto(strxfrm_l) +#endif +#if defined __USE_SVID || defined __USE_BSD || defined __USE_XOPEN_EXTENDED +libc_hidden_proto(strdup) +#endif +#if defined __USE_GNU +libc_hidden_proto(strndup) +#endif +libc_hidden_proto(strchr) +libc_hidden_proto(strrchr) +#ifdef __USE_GNU +libc_hidden_proto(strchrnul) +#endif +libc_hidden_proto(strcspn) +libc_hidden_proto(strspn) +libc_hidden_proto(strpbrk) +libc_hidden_proto(strstr) +libc_hidden_proto(strtok) +#if 0 /* uClibc: disabled */ +libc_hidden_proto(__strtok_r) +#endif +#if defined __USE_POSIX || defined __USE_MISC +libc_hidden_proto(strtok_r) +#endif +#ifdef __USE_GNU +libc_hidden_proto(strcasestr) +#endif +#ifdef __USE_GNU +libc_hidden_proto(memmem) +#if 0 /* uClibc: disabled */ +libc_hidden_proto(__mempcpy) +#endif +libc_hidden_proto(mempcpy) +#endif +libc_hidden_proto(strlen) +#ifdef __USE_GNU +libc_hidden_proto(strnlen) +#endif +libc_hidden_proto(strerror) +/* TODO: insert strerror_r mess here */ +#if 0 /* uClibc: disabled */ +libc_hidden_proto(__bzero) +#endif +#ifdef __USE_BSD +/* No libc_hidden_proto for bcopy etc., since uClibc doesn't itself use the + legacy functions. */ +libc_hidden_proto(ffs) +#if 0 /*def __USE_GNU*/ +libc_hidden_proto(ffsl) +# ifdef __GNUC__ +libc_hidden_proto(ffsll) +# endif +# endif +libc_hidden_proto(strcasecmp) +libc_hidden_proto(strncasecmp) +#endif /* Use BSD. */ +#if defined __USE_GNU && defined __UCLIBC_HAS_XLOCALE__ +libc_hidden_proto(strcasecmp_l) +libc_hidden_proto(strncasecmp_l) +#endif +#ifdef __USE_BSD +libc_hidden_proto(strsep) +#endif +#ifdef __USE_GNU +#if 0 +libc_hidden_proto(strverscmp) +#endif +libc_hidden_proto(strsignal) +#if 0 /* uClibc: disabled */ +libc_hidden_proto(__stpcpy) +#endif +libc_hidden_proto(stpcpy) +#if 0 /* uClibc: disabled */ +libc_hidden_proto(__stpncpy) +#endif +libc_hidden_proto(stpncpy) +#if 0 /* uClibc does not support strfry or memfrob. */ +libc_hidden_proto(strfry) +libc_hidden_proto(memfrob) +#endif +# ifndef basename +libc_hidden_proto(basename) +# endif +#endif +#ifdef __USE_BSD +libc_hidden_proto(strlcat) +libc_hidden_proto(strlcpy) +#endif +#endif + + #endif /* string.h */ diff --git a/include/strings.h b/include/strings.h index 107c53a4f..31e620673 100644 --- a/include/strings.h +++ b/include/strings.h @@ -90,6 +90,10 @@ extern int strncasecmp (__const char *__s1, __const char *__s2, size_t __n) __END_DECLS +#ifdef UCLIBC_INTERNAL +#error "<strings.h> should not be included from libc." +#endif + #endif /* string.h */ #endif /* strings.h */ |