Message ID | 20230123170106.3632306-1-adhemerval.zanella@linaro.org |
---|---|
State | New |
Headers | show |
Series | wchar: Define va_list for POSIX (BZ #30035) | expand |
On Jan 23 2023, Adhemerval Zanella via Libc-alpha wrote: > diff --git a/conform/data/wchar.h-data b/conform/data/wchar.h-data > index e414651a33..582a99c00b 100644 > --- a/conform/data/wchar.h-data > +++ b/conform/data/wchar.h-data > @@ -15,6 +15,9 @@ type size_t > type locale_t > # endif > tag {struct tm} > +#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined UNIX98 This is enclosed in !defined ISO && !defined POSIX && !defined XPG4 && !defined XPG42, so parts of the expression are redundant.
diff --git a/conform/data/wchar.h-data b/conform/data/wchar.h-data index e414651a33..582a99c00b 100644 --- a/conform/data/wchar.h-data +++ b/conform/data/wchar.h-data @@ -15,6 +15,9 @@ type size_t type locale_t # endif tag {struct tm} +#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined UNIX98 +type va_list +#endif function wint_t btowc (int) function int fwprintf (FILE*, const wchar_t*, ...) diff --git a/wcsmbs/wchar.h b/wcsmbs/wchar.h index 69e920b8c2..ca145bb8d2 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>