From 087722b8549cc4335c822ed39bf3dda5202093f1 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Thu, 19 Jul 2007 17:28:06 +0000 Subject: [PATCH] * include/features.h (__USE_ISOC95): New define. * wcsmbs/wchar.h (fwprintf, fwscanf, wprintf, wscanf, swprintf, swscanf, vfwprintf, vwprintf, vswprintf, fwide): Define even for -std=iso9899:199409. * CONFORMANCE: Remove comments about unsupported AMD1. --- CONFORMANCE | 9 +-------- ChangeLog | 8 ++++++++ include/features.h | 8 ++++++++ localedata/ChangeLog | 6 ++++++ nptl/ChangeLog | 5 +++++ wcsmbs/wchar.h | 4 ++-- 6 files changed, 30 insertions(+), 10 deletions(-) diff --git a/CONFORMANCE b/CONFORMANCE index 92ab7b7f52..a534b3b261 100644 --- a/CONFORMANCE +++ b/CONFORMANCE @@ -85,11 +85,9 @@ of the C standard (as indicated by __STDC_VERSION__): GCC options Standard version -ansi ISO/IEC 9899:1990 -std=c89 ISO/IEC 9899:1990 --std=iso9899:199409 ISO/IEC 9899:1990 as amended by Amd.1:1995 * +-std=iso9899:199409 ISO/IEC 9899:1990 as amended by Amd.1:1995 -std=c99 ISO/IEC 9899:1999 -* glibc does not support this standard version. - (Note that -std=c99 is not available in GCC 2.95.2, and that no version of GCC presently existing implements the full C99 standard.) @@ -183,8 +181,3 @@ Note that the _t suffix is reserved by POSIX, but not by pure ISO C. Also, the Single Unix Specification generally requires more types to be included in headers (if _XOPEN_SOURCE is defined appropriately) than ISO C permits. - - does not support AMD1; to support it, the functions -fwprintf, fwscanf, wprintf, wscanf, swprintf, swscanf, vfwprintf, -vwprintf, vswprintf and fwide would need to be declared when -__STDC_VERSION__ >= 199409L and not just for C99. diff --git a/ChangeLog b/ChangeLog index 7f73837fc4..338380a18b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2007-07-18 Jakub Jelinek + + * include/features.h (__USE_ISOC95): New define. + * wcsmbs/wchar.h (fwprintf, fwscanf, wprintf, wscanf, swprintf, + swscanf, vfwprintf, vwprintf, vswprintf, fwide): Define even + for -std=iso9899:199409. + * CONFORMANCE: Remove comments about unsupported AMD1. + 2007-07-17 Jakub Jelinek * sysdeps/ia64/sched_cpucount.c: New file. diff --git a/include/features.h b/include/features.h index 0c729e8a3e..7f99741a95 100644 --- a/include/features.h +++ b/include/features.h @@ -56,6 +56,7 @@ header files to decide what to declare or define: __USE_ISOC99 Define ISO C99 things. + __USE_ISOC95 Define ISO C90 AMD1 (C95) things. __USE_POSIX Define IEEE Std 1003.1 things. __USE_POSIX2 Define IEEE Std 1003.2 things. __USE_POSIX199309 Define IEEE Std 1003.1, and .1b things. @@ -90,6 +91,7 @@ /* Undefine everything, so we get a clean slate. */ #undef __USE_ISOC99 +#undef __USE_ISOC95 #undef __USE_POSIX #undef __USE_POSIX2 #undef __USE_POSIX199309 @@ -184,6 +186,12 @@ # define __USE_ISOC99 1 #endif +/* This is to enable the ISO C90 Amendment 1:1995 extension. */ +#if (defined _ISOC99_SOURCE || defined _ISOC9X_SOURCE \ + || (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199409L)) +# define __USE_ISOC95 1 +#endif + /* If none of the ANSI/POSIX macros are defined, use POSIX.1 and POSIX.2 (and IEEE Std 1003.1b-1993 unless _XOPEN_SOURCE is defined). */ #if ((!defined __STRICT_ANSI__ || (_XOPEN_SOURCE - 0) >= 500) && \ diff --git a/localedata/ChangeLog b/localedata/ChangeLog index 2aa5560235..7a7a62fa2f 100644 --- a/localedata/ChangeLog +++ b/localedata/ChangeLog @@ -1,3 +1,9 @@ +2007-07-16 Jakub Jelinek + + * locales/ar_SA (d_t_fmt, d_fmt, t_fmt, t_fmt_ampm): Replace %.1d + with supported %e and %.1H with %k. + * locales/dz_BT (t_fmt): Remove whitespace between % and H. + 2007-07-10 Ulrich Drepper [BZ #4773] diff --git a/nptl/ChangeLog b/nptl/ChangeLog index 0a463b2164..16751a9eb1 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,8 @@ +2007-07-17 Jakub Jelinek + + * sysdeps/pthread/bits/stdio-lock.h (_IO_acquire_lock_clear_flags2): + Define. + 2007-07-06 Kaz Kojima * sysdeps/sh/tls.h: Include stdlib.h, list.h, sysdep.h and diff --git a/wcsmbs/wchar.h b/wcsmbs/wchar.h index 5ef4b1a98f..e9a3fba8c1 100644 --- a/wcsmbs/wchar.h +++ b/wcsmbs/wchar.h @@ -607,7 +607,7 @@ extern wchar_t *wcpncpy (wchar_t *__dest, __const wchar_t *__src, size_t __n) extern __FILE *open_wmemstream (wchar_t **__bufloc, size_t *__sizeloc) __THROW; #endif -#if defined __USE_ISOC99 || defined __USE_UNIX98 +#if defined __USE_ISOC95 || defined __USE_UNIX98 __BEGIN_NAMESPACE_C99 /* Select orientation for stream. */ @@ -674,7 +674,7 @@ extern int swscanf (__const wchar_t *__restrict __s, __THROW /* __attribute__ ((__format__ (__wscanf__, 2, 3))) */; __END_NAMESPACE_C99 -#endif /* Use ISO C99 and Unix98. */ +#endif /* Use ISO C95, C99 and Unix98. */ #ifdef __USE_ISOC99 __BEGIN_NAMESPACE_C99 -- 2.11.4.GIT