Do not expose the weak_alias() junk to the world. Wrap it

[uclinux-h8/uClibc.git] / include / string.h

diff --git a/include/string.h b/include/string.h
index 3c03c7c..22608b6 100644 (file)
--- a/include/string.h
+++ b/include/string.h
@@ -62,16 +62,16 @@ extern int memcmp (__const void *__s1, __const void *__s2, size_t __n)
 extern void *memchr (__const void *__s, int __c, size_t __n)
       __THROW __attribute_pure__;
 
+/*#ifdef __USE_GNU*/
 #if 0
-//#ifdef __USE_GNU
 /* Search in S for C.  This is similar to `memchr' but there is no
    length limit.  */
 extern void *rawmemchr (__const void *__s, int __c) __THROW __attribute_pure__;
 
+#endif
 /* 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__;
-#endif
 
 
 /* Copy SRC to DEST.  */
@@ -103,7 +103,7 @@ extern size_t strxfrm (char *__restrict __dest,
                       __const char *__restrict __src, size_t __n) __THROW;
 
 #if 0
-//#ifdef __USE_GNU
+/*#ifdef __USE_GNU*/
 /* The following functions are equivalent to the both above but they
    take the locale they use for the collation as an extra argument.
    This is not standardsized but something like will come.  */
@@ -125,8 +125,7 @@ extern char *strdup (__const char *__s) __THROW __attribute_malloc__;
 /* Return a malloc'd copy of at most N bytes of STRING.  The
    resultant string is terminated even if no null terminator
    appears before STRING[N].  */
-#if 0
-//#if defined __USE_GNU
+#if defined __USE_GNU
 extern char *strndup (__const char *__string, size_t __n)
      __THROW __attribute_malloc__;
 #endif
@@ -160,7 +159,7 @@ extern char *strchr (__const char *__s, int __c) __THROW __attribute_pure__;
 extern char *strrchr (__const char *__s, int __c) __THROW __attribute_pure__;
 
 #if 0
-//#ifdef __USE_GNU
+/*#ifdef __USE_GNU*/
 /* This funciton is similar to `strchr'.  But it returns a pointer to
    the closing NUL byte in case C is not found in S.  */
 extern char *strchrnul (__const char *__s, int __c) __THROW __attribute_pure__;
@@ -201,14 +200,15 @@ extern char *strtok_r (char *__restrict __s, __const char *__restrict __delim,
                       char **__restrict __save_ptr) __THROW;
 #endif
 
+#ifdef __USE_GNU
 #if 0
-//#ifdef __USE_GNU
 /* Find the first occurrence of NEEDLE in HAYSTACK.
    NEEDLE is NEEDLELEN bytes long;
    HAYSTACK is HAYSTACKLEN bytes long.  */
 extern void *memmem (__const void *__haystack, size_t __haystacklen,
                     __const void *__needle, size_t __needlelen)
      __THROW __attribute_pure__;
+#endif
 
 /* Copy N bytes of SRC to DEST, return pointer to bytes after the
    last written byte.  */
@@ -266,7 +266,7 @@ extern int ffs (int __i) __THROW __attribute__ ((__const__));
 /* The following two functions are non-standard but necessary for non-32 bit
    platforms.  */
 # if 0
-//# ifdef      __USE_GNU
+/*# ifdef      __USE_GNU*/
 extern int ffsl (long int __l) __THROW __attribute__ ((__const__));
 #  ifdef __GNUC__
 __extension__ extern int ffsll (long long int __ll)
@@ -284,7 +284,7 @@ extern int strncasecmp (__const char *__s1, __const char *__s2, size_t __n)
 #endif /* Use BSD.  */
 
 #if 0
-//#ifdef       __USE_GNU
+/*#ifdef       __USE_GNU*/
 /* Again versions of a few functions which use the given locale instead
    of the global one.  */
 extern int __strcasecmp_l (__const char *__s1, __const char *__s2,
@@ -312,13 +312,11 @@ extern int strverscmp (__const char *__s1, __const char *__s2)
 /* Return a string describing the meaning of the signal number in SIG.  */
 extern char *strsignal (int __sig) __THROW;
 
-#if 0
 /* Copy SRC to DEST, returning the address of the terminating '\0' in DEST.  */
 extern char *__stpcpy (char *__restrict __dest, __const char *__restrict __src)
      __THROW;
 extern char *stpcpy (char *__restrict __dest, __const char *__restrict __src)
      __THROW;
-#endif
 
 /* Copy no more than N characters of SRC to DEST, returning the address of
    the last character written into DEST.  */