From a363f7075125fa654342c69331e6c075518ec28c Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella Date: Mon, 23 Jan 2023 13:59:31 -0300 Subject: 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 --- conform/data/wchar.h-data | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'conform') 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*) -- cgit 1.4.1