about summary refs log tree commit diff
path: root/conform/data/wchar.h-data
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2012-11-07 19:36:48 +0000
committerJoseph Myers <joseph@codesourcery.com>2012-11-07 19:36:48 +0000
commit05bcf62afbfcf1a42ef2d8e80e0dba887d970781 (patch)
treec83528edc34f837ad2ce15e54c890d25faf14ad7 /conform/data/wchar.h-data
parent01f34a3bd8c087ca4be0bd24857e454c8d29f20b (diff)
downloadglibc-05bcf62afbfcf1a42ef2d8e80e0dba887d970781.tar.gz
glibc-05bcf62afbfcf1a42ef2d8e80e0dba887d970781.tar.xz
glibc-05bcf62afbfcf1a42ef2d8e80e0dba887d970781.zip
conformtest: Clean up / correct / expand C99 and C11 expectations.
Diffstat (limited to 'conform/data/wchar.h-data')
-rw-r--r--conform/data/wchar.h-data25
1 files changed, 20 insertions, 5 deletions
diff --git a/conform/data/wchar.h-data b/conform/data/wchar.h-data
index fdb68d03b9..805cbe6e13 100644
--- a/conform/data/wchar.h-data
+++ b/conform/data/wchar.h-data
@@ -14,6 +14,7 @@ type size_t
 # if defined XOPEN2K8 || defined POSIX2008
 type locale_t
 # endif
+tag {struct tm}
 
 function wint_t btowc (int)
 function int fwprintf (FILE*, const wchar_t*, ...)
@@ -104,9 +105,19 @@ function size_t wcsrtombs (char*, const wchar_t**, size_t, mbstate_t*)
 function size_t wcsspn (const wchar_t*, const wchar_t*)
 function {wchar_t*} wcsstr (const wchar_t*, const wchar_t*)
 function double wcstod (const wchar_t*, wchar_t**)
+# ifndef UNIX98
+function float wcstof (const wchar_t*, wchar_t**)
+function {long double} wcstold (const wchar_t*, wchar_t**)
+# endif
 function {wchar_t*} wcstok (wchar_t*, const wchar_t*, wchar_t**)
 function {long int} wcstol (const wchar_t*, wchar_t**, int)
+# ifndef UNIX98
+function {long long int} wcstoll (const wchar_t*, wchar_t**, int)
+# endif
 function {unsigned long int} wcstoul (const wchar_t*, wchar_t**, int)
+# ifndef UNIX98
+function {unsigned long long int} wcstoull (const wchar_t*, wchar_t**, int)
+# endif
 # if defined UNIX98 || defined XOPEN2K
 function {wchar_t*} wcswcs (const wchar_t*, const wchar_t*)
 # endif
@@ -130,11 +141,12 @@ function {wchar_t*} wmemset (wchar_t*, wchar_t, size_t)
 function int wprintf (const wchar_t*, ...)
 function int wscanf (const wchar_t*, ...)
 
-macro WCHAR_MAX
-macro WCHAR_MIN
-macro WEOF
-macro NULL
+macro-int-constant WCHAR_MIN {promoted:wchar_t}
+macro-int-constant WCHAR_MAX {promoted:wchar_t} >= 127
+macro-constant WEOF {wint_t}
+macro-constant NULL == 0
 
+#if !defined ISO && !defined ISO99 && !defined ISO11
 allow-header ctype.h
 allow-header stdio.h
 allow-header stdarg.h
@@ -142,7 +154,10 @@ allow-header stdlib.h
 allow-header string.h
 allow-header stddef.h
 allow-header time.h
+#endif
 
-allow wcs*
+allow wcs[abcdefghijklmnopqrstuvwxyz]*
+#if !defined ISO && !defined ISO99 && !defined ISO11
 allow *_t
 #endif
+#endif