diff options
| author | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2023-01-23 13:59:31 -0300 |
|---|---|---|
| committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2023-05-25 16:43:29 -0300 |
| commit | a363f7075125fa654342c69331e6c075518ec28c (patch) | |
| tree | 7481277d71f77b9b66d98b1dba56ab406d324a65 | |
| parent | d2b1af43057c2bde5b180868a67d2b2bc2de95b7 (diff) | |
| download | glibc-a363f7075125fa654342c69331e6c075518ec28c.zip glibc-a363f7075125fa654342c69331e6c075518ec28c.tar.gz glibc-a363f7075125fa654342c69331e6c075518ec28c.tar.bz2 | |
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
| -rw-r--r-- | conform/data/wchar.h-data | 17 | ||||
| -rw-r--r-- | 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 e414651..2433210 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 acc2eb9..d16f2e6 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> |