X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=include%2Fstring.h;h=94188bc02ecdf5f20aa815db96b8c8d37abd3fd2;hp=f189c082fbf1c98741633d23db9541ab1582f210;hb=32e2c468baac683114efdf836632aa948872b5ce;hpb=0b44a0315b47dd8eced9f3b7f31580cf14bbfc01

diff --git a/include/string.h b/include/string.h
index f189c082..94188bc0 100644
--- a/include/string.h
+++ b/include/string.h
@@ -17,7 +17,6 @@ extern "C" {
 
 void *memcpy (void *, const void *, size_t);
 void *memmove (void *, const void *, size_t);
-void *memccpy (void *, const void *, int, size_t);
 void *memset (void *, int, size_t);
 int memcmp (const void *, const void *, size_t);
 void *memchr (const void *, int, size_t);
@@ -34,8 +33,6 @@ int strncmp (const char *, const char *, size_t);
 int strcoll (const char *, const char *);
 size_t strxfrm (char *, const char *, size_t);
 
-char *strdup (const char *);
-
 char *strchr (const char *, int);
 char *strrchr (const char *, int);
 
@@ -43,26 +40,42 @@ size_t strcspn (const char *, const char *);
 size_t strspn (const char *, const char *);
 char *strpbrk (const char *, const char *);
 char *strstr (const char *, const char *);
-
 char *strtok (char *, const char *);
-char *strtok_r (char *, const char *, char **);
 
 size_t strlen (const char *);
 
 char *strerror (int);
-int strerror_r (int, char *, size_t);
 
-size_t strlcat (char *, const char *, size_t);
-size_t strlcpy (char *, const char *, size_t);
 
+#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
+ || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE)
+char *strtok_r (char *, const char *, char **);
+int strerror_r (int, char *, size_t);
 char *stpcpy(char *, const char *);
 char *stpncpy(char *, const char *, size_t);
 size_t strnlen (const char *, size_t);
+char *strdup (const char *);
+char *strndup (const char *, size_t);
+char *strsignal(int);
+#endif
+
+#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE)
+void *memccpy (void *, const void *, int, size_t);
+#endif
+
+#ifdef _BSD_SOURCE
+size_t strlcat (char *, const char *, size_t);
+size_t strlcpy (char *, const char *, size_t);
+#endif
 
 #ifdef _GNU_SOURCE
 int strcasecmp (const char *, const char *);
 int strncasecmp (const char *, const char *, size_t);
 char *strchrnul(const char *, int);
+char *strcasestr(const char *, const char *);
+char *strsep(char **, const char *);
+void *memrchr(const void *, int, size_t);
+void *mempcpy(void *, void *, size_t);
 #endif
 
 #ifdef __cplusplus