From 05bcf62afbfcf1a42ef2d8e80e0dba887d970781 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Wed, 7 Nov 2012 19:36:48 +0000 Subject: conformtest: Clean up / correct / expand C99 and C11 expectations. --- conform/data/wctype.h-data | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'conform/data/wctype.h-data') diff --git a/conform/data/wctype.h-data b/conform/data/wctype.h-data index cbd1dac280..91638e61dc 100644 --- a/conform/data/wctype.h-data +++ b/conform/data/wctype.h-data @@ -8,6 +8,9 @@ type locale_t function int iswalnum (wint_t) function int iswalpha (wint_t) +# ifndef UNIX98 +function int iswblank (wint_t) +# endif function int iswcntrl (wint_t) function int iswdigit (wint_t) function int iswgraph (wint_t) @@ -26,6 +29,7 @@ function wctype_t wctype (const char*) # if defined XOPEN2K8 || defined POSIX2008 function int iswalnum_l (wint_t, locale_t) function int iswalpha_l (wint_t, locale_t) +function int iswblank_l (wint_t, locale_t) function int iswcntrl_l (wint_t, locale_t) function int iswdigit_l (wint_t, locale_t) function int iswgraph_l (wint_t, locale_t) @@ -43,8 +47,9 @@ function wctrans_t wctrans_l (const char*, locale_t) function wctype_t wctype_l (const char*, locale_t) # endif -macro WEOF +macro-constant WEOF {wint_t} +#if !defined ISO && !defined ISO99 && !defined ISO11 allow-header ctype.h allow-header stdio.h allow-header stdarg.h @@ -53,8 +58,11 @@ allow-header string.h allow-header stddef.h allow-header time.h allow-header wchar.h +#endif -allow is* -allow to* +allow is[abcdefghijklmnopqrstuvwxyz]* +allow to[abcdefghijklmnopqrstuvwxyz]* +#if !defined ISO && !defined ISO99 && !defined ISO11 allow *_t #endif +#endif -- cgit v1.2.3