public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
* [glibc] wchar: Define va_list for POSIX (BZ #30035)
@ 2023-05-25 19:58 Adhemerval Zanella
0 siblings, 0 replies; only message in thread
From: Adhemerval Zanella @ 2023-05-25 19:58 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=a363f7075125fa654342c69331e6c075518ec28c
commit a363f7075125fa654342c69331e6c075518ec28c
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date: Mon Jan 23 13:59:31 2023 -0300
wchar: Define va_list for POSIX (BZ #30035)
This was uncovered by a recent clang change [1]. Different than ISO C,
POSIX states that va_list should be exported by wchar.h [2].
Checked on x86_64-linux-gnu and aarch64-linux-gnu.
[1] https://reviews.llvm.org/D137268
[2] https://pubs.opengroup.org/onlinepubs/9699919799.2018edition/basedefs/wchar.h.html
Diff:
---
conform/data/wchar.h-data | 17 +++++++++++------
wcsmbs/wchar.h | 11 +++++++++++
2 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/conform/data/wchar.h-data b/conform/data/wchar.h-data
index e414651a33..243321090d 100644
--- a/conform/data/wchar.h-data
+++ b/conform/data/wchar.h-data
@@ -15,6 +15,11 @@ type size_t
type locale_t
# endif
tag {struct tm}
+# if !defined ISO99 && !defined ISO11 && !defined UNIX98
+type va_list
+# else
+# define va_list __gnuc_va_list
+# endif
function wint_t btowc (int)
function int fwprintf (FILE*, const wchar_t*, ...)
@@ -59,17 +64,17 @@ function wint_t towlower (wint_t)
function wint_t towupper (wint_t)
# endif
function wint_t ungetwc (wint_t, FILE*)
-function int vfwprintf (FILE*, const wchar_t*, __gnuc_va_list)
+function int vfwprintf (FILE*, const wchar_t*, va_list)
# ifndef UNIX98
-function int vfwscanf (FILE*, const wchar_t*, __gnuc_va_list)
+function int vfwscanf (FILE*, const wchar_t*, va_list)
# endif
-function int vwprintf (const wchar_t*, __gnuc_va_list)
+function int vwprintf (const wchar_t*, va_list)
# ifndef UNIX98
-function int vwscanf (const wchar_t*, __gnuc_va_list)
+function int vwscanf (const wchar_t*, va_list)
# endif
-function int vswprintf (wchar_t*, size_t, const wchar_t*, __gnuc_va_list)
+function int vswprintf (wchar_t*, size_t, const wchar_t*, va_list)
# ifndef UNIX98
-function int vswscanf (const wchar_t*, const wchar_t*, __gnuc_va_list)
+function int vswscanf (const wchar_t*, const wchar_t*, va_list)
# endif
# if defined XOPEN2K8 || defined POSIX2008
function {wchar_t*} wcpcpy (wchar_t*, const wchar_t*)
diff --git a/wcsmbs/wchar.h b/wcsmbs/wchar.h
index acc2eb9ddf..d16f2e6951 100644
--- a/wcsmbs/wchar.h
+++ b/wcsmbs/wchar.h
@@ -37,6 +37,17 @@
#define __need___va_list
#include <stdarg.h>
+#if defined __USE_XOPEN2K || defined __USE_XOPEN2K8
+# ifdef __GNUC__
+# ifndef _VA_LIST_DEFINED
+typedef __gnuc_va_list va_list;
+# define _VA_LIST_DEFINED
+# endif
+# else
+# include <stdarg.h>
+# endif
+#endif
+
#include <bits/wchar.h>
#include <bits/types/wint_t.h>
#include <bits/types/mbstate_t.h>
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2023-05-25 19:58 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-05-25 19:58 [glibc] wchar: Define va_list for POSIX (BZ #30035) Adhemerval Zanella
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).