From: Florian Weimer <fweimer@redhat.com>
Date: Thu, 6 Apr 2023 14:40:44 +0000 (+0200)
Subject: <stdio.h>: Make fopencookie, vasprintf, asprintf available by default
X-Git-Tag: glibc-2.38~393
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0d5cb2ae27c0a163c15e5222fb132bf9d026b14b;p=thirdparty%2Fglibc.git

<stdio.h>: Make fopencookie, vasprintf, asprintf available by default

FreeBSD makes these functions available by default, so we should
not treat them as GNU-specific and restrict them to _GNU_SOURCE.

Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>
---

diff --git a/libio/stdio.h b/libio/stdio.h
index 686c40f28dc..45ddafdf205 100644
--- a/libio/stdio.h
+++ b/libio/stdio.h
@@ -42,7 +42,7 @@ __BEGIN_DECLS
 #include <bits/types/FILE.h>
 #include <bits/types/struct_FILE.h>
 
-#ifdef __USE_GNU
+#ifdef __USE_MISC
 # include <bits/types/cookie_io_functions_t.h>
 #endif
 
@@ -299,7 +299,7 @@ extern FILE *fdopen (int __fd, const char *__modes) __THROW
   __attribute_malloc__ __attr_dealloc_fclose __wur;
 #endif
 
-#ifdef	__USE_GNU
+#ifdef	__USE_MISC
 /* Create a new stream that refers to the given magic cookie,
    and uses the given functions for input and output.  */
 extern FILE *fopencookie (void *__restrict __magic_cookie,
@@ -389,7 +389,7 @@ extern int vsnprintf (char *__restrict __s, size_t __maxlen,
      __THROWNL __attribute__ ((__format__ (__printf__, 3, 0)));
 #endif
 
-#if __GLIBC_USE (LIB_EXT2)
+#if defined (__USE_MISC) || __GLIBC_USE (LIB_EXT2)
 /* Write formatted output to a string dynamically allocated with `malloc'.
    Store the address of the string in *PTR.  */
 extern int vasprintf (char **__restrict __ptr, const char *__restrict __f,