about summary refs log tree commit diff
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2023-04-06 16:40:44 +0200
committerFlorian Weimer <fweimer@redhat.com>2023-04-06 16:41:12 +0200
commit30e3ca78f92be44f46851557f54b47e789bd3416 (patch)
treea2a076755133080991c63f80ab68340480ea32bc
parent81a3cc956ef4e324c83419fa6d7a559d6e762cd7 (diff)
downloadglibc-30e3ca78f92be44f46851557f54b47e789bd3416.tar.gz
glibc-30e3ca78f92be44f46851557f54b47e789bd3416.tar.xz
glibc-30e3ca78f92be44f46851557f54b47e789bd3416.zip
<string.h>: Make strchrnul, strcasestr, memmem available by default
FreeBSD makes them available by default, too, so there does not seem
to be a reason to restrict these functions to _GNU_SOURCE.

Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>
-rw-r--r--string/string.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/string/string.h b/string/string.h
index 7f0f600224..4927879ecf 100644
--- a/string/string.h
+++ b/string/string.h
@@ -274,7 +274,7 @@ extern char *strrchr (const char *__s, int __c)
      __THROW __attribute_pure__ __nonnull ((1));
 #endif
 
-#ifdef __USE_GNU
+#ifdef __USE_MISC
 /* This function is similar to `strchr'.  But it returns a pointer to
    the closing NUL byte in case C is not found in S.  */
 # ifdef __CORRECT_ISO_CPP_STRING_H_PROTO
@@ -368,7 +368,7 @@ extern char *strtok_r (char *__restrict __s, const char *__restrict __delim,
      __THROW __nonnull ((2, 3));
 #endif
 
-#ifdef __USE_GNU
+#ifdef __USE_MISC
 /* Similar to `strstr' but this function ignores the case of both strings.  */
 # ifdef __CORRECT_ISO_CPP_STRING_H_PROTO
 extern "C++" char *strcasestr (char *__haystack, const char *__needle)
@@ -382,7 +382,7 @@ extern char *strcasestr (const char *__haystack, const char *__needle)
 # endif
 #endif
 
-#ifdef __USE_GNU
+#ifdef __USE_MISC
 /* Find the first occurrence of NEEDLE in HAYSTACK.
    NEEDLE is NEEDLELEN bytes long;
    HAYSTACK is HAYSTACKLEN bytes long.  */