do not provide /usr/lib/locale

[platform/upstream/glibc.git] / include / string.h

diff --git a/include/string.h b/include/string.h
index c196007..034e295 100644 (file)
--- a/include/string.h
+++ b/include/string.h
@@ -1,69 +1,74 @@
 #ifndef _STRING_H
 
+#ifndef _ISOMAC
 #include <sys/types.h>
 
-extern void *__memccpy (void *__dest, __const void *__src,
+extern void *__memccpy (void *__dest, const void *__src,
                        int __c, size_t __n);
 
-extern size_t __strnlen (__const char *__string, size_t __maxlen)
+extern size_t __strnlen (const char *__string, size_t __maxlen)
      __attribute_pure__;
 
-extern char *__strsep (char **__stringp, __const char *__delim);
+extern char *__strsep (char **__stringp, const char *__delim);
 
-extern int __strverscmp (__const char *__s1, __const char *__s2)
+extern int __strverscmp (const char *__s1, const char *__s2)
      __attribute_pure__;
 
-extern int __strncasecmp (__const char *__s1, __const char *__s2,
+extern int __strncasecmp (const char *__s1, const char *__s2,
                          size_t __n)
      __attribute_pure__;
 
-extern int __strcasecmp (__const char *__s1, __const char *__s2)
+extern int __strcasecmp (const char *__s1, const char *__s2)
      __attribute_pure__;
 
-extern char *__strcasestr (__const char *__haystack, __const char *__needle)
+extern char *__strcasestr (const char *__haystack, const char *__needle)
      __attribute_pure__;
 
-extern char *__strdup (__const char *__string)
+extern char *__strdup (const char *__string)
      __attribute_malloc__;
-extern char *__strndup (__const char *__string, size_t __n)
+extern char *__strndup (const char *__string, size_t __n)
      __attribute_malloc__;
 
-extern void *__rawmemchr (__const void *__s, int __c)
+extern void *__rawmemchr (const void *__s, int __c)
      __attribute_pure__;
 
-extern char *__strchrnul (__const char *__s, int __c)
+extern char *__strchrnul (const char *__s, int __c)
      __attribute_pure__;
 
-extern void *__memrchr (__const void *__s, int __c, size_t __n)
+extern void *__memrchr (const void *__s, int __c, size_t __n)
      __attribute_pure__;
 
-extern void *__memchr (__const void *__s, int __c, size_t __n)
+extern void *__memchr (const void *__s, int __c, size_t __n)
      __attribute_pure__;
 
 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;
 extern __typeof (strncasecmp_l) __strncasecmp_l;
 
 /* Alternative version which doesn't pollute glibc's namespace.  */
-#undef strndupa
-#define strndupa(s, n)                                                       \
+#if IS_IN (libc)
+# undef strndupa
+# define strndupa(s, n)                                                              \
   (__extension__                                                             \
     ({                                                                       \
-      __const char *__old = (s);                                             \
+      const char *__old = (s);                                               \
       size_t __len = __strnlen (__old, (n));                                 \
       char *__new = (char *) __builtin_alloca (__len + 1);                   \
       __new[__len] = '\0';                                                   \
       (char *) memcpy (__new, __old, __len);                                 \
     }))
+#endif
 
 libc_hidden_proto (__mempcpy)
 libc_hidden_proto (__stpcpy)
@@ -81,9 +86,13 @@ libc_hidden_proto (strcoll)
 libc_hidden_proto (__strcoll_l)
 libc_hidden_proto (__strxfrm_l)
 libc_hidden_proto (__strtok_r)
-extern char *__strsep_g (char **__stringp, __const char *__delim);
+extern char *__strsep_g (char **__stringp, const char *__delim);
 libc_hidden_proto (__strsep_g)
 libc_hidden_proto (strnlen)
+libc_hidden_proto (memmem)
+extern __typeof (memmem) __memmem;
+libc_hidden_proto (__memmem)
+libc_hidden_proto (__ffs)
 
 libc_hidden_builtin_proto (memchr)
 libc_hidden_builtin_proto (memcpy)
@@ -106,6 +115,14 @@ libc_hidden_builtin_proto (strspn)
 libc_hidden_builtin_proto (strstr)
 libc_hidden_builtin_proto (ffs)
 
+#if (!IS_IN (libc) || !defined SHARED) \
+  && !defined NO_MEMPCPY_STPCPY_REDIRECT
+/* Redirect calls to __builtin_mempcpy and __builtin_stpcpy to call
+   __mempcpy and __stpcpy if not inlined.  */
+extern __typeof (mempcpy) mempcpy __asm__ ("__mempcpy");
+extern __typeof (stpcpy) stpcpy __asm__ ("__stpcpy");
+#endif
+
 # ifndef _ISOMAC
 #  ifndef index
 #   define index(s, c) (strchr ((s), (c)))
@@ -140,5 +157,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