<string.h>: Make strchrnul, strcasestr, memmem available by default

Message ID 87h6yo4e3v.fsf@oldenburg.str.redhat.com
State New
Series <string.h>: Make strchrnul, strcasestr, memmem available by default |


Context Check Description
dj/TryBot-apply_patch success Patch applied to master at the time it was sent
dj/TryBot-32bit success Build for i686

Commit Message

Florian Weimer Nov. 24, 2022, 2:32 p.m. UTC
  FreeBSD makes them available by default, too, so there does not seem
to be a reason to restrict these functions to _GNU_SOURCE.

Tested on x86_64-linux-gnu.

 string/string.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

base-commit: a46956e65d037358161e7512a9f0fd408ea1333a


diff --git a/string/string.h b/string/string.h
index 54dd8344de..bfeeeb2eb4 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));
-#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.  */
@@ -368,7 +368,7 @@  extern char *strtok_r (char *__restrict __s, const char *__restrict __delim,
      __THROW __nonnull ((2, 3));
-#ifdef __USE_GNU
+#ifdef __USE_MISC
 /* Similar to `strstr' but this function ignores the case of both strings.  */
 extern "C++" char *strcasestr (char *__haystack, const char *__needle)
@@ -382,7 +382,7 @@  extern char *strcasestr (const char *__haystack, const char *__needle)
 # 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.  */