diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2010-01-11 20:07:47 -0800 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2010-01-11 20:07:47 -0800 |
| commit | e531ede5aff20b04937bd52763dd9294983dbfdd (patch) | |
| tree | e136a18a6bf68142466a13e48f3e8a74d44be48c | |
| parent | 37c8e46632ed9604e267db6fc0cc7c67669852fa (diff) | |
| download | glibc-e531ede5aff20b04937bd52763dd9294983dbfdd.tar.gz glibc-e531ede5aff20b04937bd52763dd9294983dbfdd.tar.xz glibc-e531ede5aff20b04937bd52763dd9294983dbfdd.zip | |
Fix up wchar.h for XPG7.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | conform/data/wchar.h-data | 14 | ||||
| -rw-r--r-- | include/features.h | 6 |
3 files changed, 18 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog index 40056f0faa..02d83df43c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2010-01-11 Ulrich Drepper <drepper@redhat.com> + * conform/data/wchar.h-data: Fix up XPG7 tests. + + * include/features.h: Fix __USE_ISOC95 handling. + * conform/data/wordexp.h-data: Fix typo in last change. * conform/data/unistd.h-data: Fix up older POSIX tests. diff --git a/conform/data/wchar.h-data b/conform/data/wchar.h-data index 0911f12e48..bf9e1a92e5 100644 --- a/conform/data/wchar.h-data +++ b/conform/data/wchar.h-data @@ -53,12 +53,12 @@ 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*, va_list) -function int vfwscanf (FILE*, const wchar_t*, va_list) -function int vwprintf (const wchar_t*, va_list) -function int vwscanf (const wchar_t*, va_list) -function int vswprintf (wchar_t*, size_t, const wchar_t*, va_list) -function int vswscanf (const wchar_t*, const wchar_t*, va_list) +function int vfwprintf (FILE*, const wchar_t*, __gnuc_va_list) +function int vfwscanf (FILE*, const wchar_t*, __gnuc_va_list) +function int vwprintf (const wchar_t*, __gnuc_va_list) +function int vwscanf (const wchar_t*, __gnuc_va_list) +function int vswprintf (wchar_t*, size_t, const wchar_t*, __gnuc_va_list) +function int vswscanf (const wchar_t*, const wchar_t*, __gnuc_va_list) #if defined XOPEN2K8 || defined POSIX2008 function {wchar_t*} wcpcpy (wchar_t*, const wchar_t*) function {wchar_t*} wcpncpy (wchar_t*, const wchar_t*, size_t) @@ -102,7 +102,9 @@ function double wcstod (const wchar_t*, wchar_t**) function {wchar_t*} wcstok (wchar_t*, const wchar_t*, wchar_t**) function {long int} wcstol (const wchar_t*, wchar_t**, int) function {unsigned long int} wcstoul (const wchar_t*, wchar_t**, int) +#if defined UNIX98 || defined XOPEN2K function {wchar_t*} wcswcs (const wchar_t*, const wchar_t*) +#endif #if !defined ISO && !defined POSIX && !defined POSIX2008 function int wcswidth (const wchar_t*, size_t) #endif diff --git a/include/features.h b/include/features.h index 21822b6a43..e7c8da1141 100644 --- a/include/features.h +++ b/include/features.h @@ -153,6 +153,8 @@ /* If _GNU_SOURCE was defined by the user, turn on all the other features. */ #ifdef _GNU_SOURCE +# undef _ISOC95_SOURCE +# define _ISOC95_SOURCE 1 # undef _ISOC99_SOURCE # define _ISOC99_SOURCE 1 # undef _POSIX_SOURCE @@ -233,6 +235,8 @@ #if (_POSIX_C_SOURCE - 0) >= 200112L # define __USE_XOPEN2K 1 +# undef __USE_ISOC95 +# define __USE_ISOC95 1 # undef __USE_ISOC99 # define __USE_ISOC99 1 #endif @@ -257,6 +261,8 @@ # endif # define __USE_XOPEN2K 1 # define __USE_XOPEN2KXSI 1 +# undef __USE_ISOC95 +# define __USE_ISOC95 1 # undef __USE_ISOC99 # define __USE_ISOC99 1 # endif |