On Wed, 14 Dec 2011 20:54:05 +0100, Pascal Stumpf wrote: > So ... Any oks for this diff? > > > Index: os_defines.h > =================================================================== > RCS file: /cvs/src/gnu/gcc/libstdc++-v3/config/os/bsd/openbsd/os_defines.h,v > retrieving revision 1.2 > diff -u -p -r1.2 os_defines.h > --- os_defines.h 26 May 2010 11:23:06 -0000 1.2 > +++ os_defines.h 14 Dec 2011 19:53:49 -0000 > @@ -35,11 +35,8 @@ > // file will come before all others. > > #define _GLIBCXX_USE_C99 1 > -#define _GLIBCXX_USE_C99_CHECK 1 > #define _GLIBCXX_USE_C99_DYNAMIC (!(__ISO_C_VISIBLE >= 1999)) > -#define _GLIBCXX_USE_C99_LONG_LONG_CHECK 1 > #define _GLIBCXX_USE_C99_LONG_LONG_DYNAMIC (_GLIBCXX_USE_C99_DYNAMIC || !def > ined __LONG_LONG_SUPPORTED) > -#define _GLIBCXX_USE_C99_FLOAT_TRANSCENDENTALS_CHECK 1 > #define _GLIBCXX_USE_C99_FLOAT_TRANSCENDENTALS_DYNAMIC defined _XOPEN_SOURCE > typedef __builtin_va_list __gnuc_va_list; >
And followup converting restrict -> __restrict (I hope I caught them all). ok? Index: std_cstdio.h =================================================================== RCS file: /cvs/src/gnu/gcc/libstdc++-v3/include/c_std/std_cstdio.h,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 std_cstdio.h --- std_cstdio.h 15 Oct 2009 17:11:32 -0000 1.1.1.1 +++ std_cstdio.h 15 Dec 2011 10:04:36 -0000 @@ -156,14 +156,14 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) #if _GLIBCXX_USE_C99_CHECK || _GLIBCXX_USE_C99_DYNAMIC extern "C" int - (snprintf)(char * restrict, size_t, const char * restrict, ...); + (snprintf)(char * __restrict, size_t, const char * __restrict, ...); extern "C" int - (vfscanf)(FILE * restrict, const char * restrict, __gnuc_va_list); - extern "C" int (vscanf)(const char * restrict, __gnuc_va_list); + (vfscanf)(FILE * __restrict, const char * __restrict, __gnuc_va_list); + extern "C" int (vscanf)(const char * __restrict, __gnuc_va_list); extern "C" int - (vsnprintf)(char * restrict, size_t, const char * restrict, __gnuc_va_list); + (vsnprintf)(char * __restrict, size_t, const char * __restrict, __gnuc_va_list); extern "C" int - (vsscanf)(const char * restrict, const char * restrict, __gnuc_va_list); + (vsscanf)(const char * __restrict, const char * __restrict, __gnuc_va_list); #endif #if !_GLIBCXX_USE_C99_DYNAMIC Index: std_cstdlib.h =================================================================== RCS file: /cvs/src/gnu/gcc/libstdc++-v3/include/c_std/std_cstdlib.h,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 std_cstdlib.h --- std_cstdlib.h 15 Oct 2009 17:11:32 -0000 1.1.1.1 +++ std_cstdlib.h 15 Dec 2011 10:04:36 -0000 @@ -186,9 +186,9 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) #if _GLIBCXX_USE_C99_LONG_LONG_CHECK || _GLIBCXX_USE_C99_LONG_LONG_DYNAMIC extern "C" long long int (atoll)(const char *); extern "C" long long int - (strtoll)(const char * restrict, char ** restrict, int); + (strtoll)(const char * __restrict, char ** __restrict, int); extern "C" unsigned long long int - (strtoull)(const char * restrict, char ** restrict, int); + (strtoull)(const char * __restrict, char ** __restrict, int); #endif #if !_GLIBCXX_USE_C99_LONG_LONG_DYNAMIC using ::atoll; Index: std_cwchar.h =================================================================== RCS file: /cvs/src/gnu/gcc/libstdc++-v3/include/c_std/std_cwchar.h,v retrieving revision 1.6 diff -u -p -r1.6 std_cwchar.h --- std_cwchar.h 17 Oct 2011 08:47:49 -0000 1.6 +++ std_cwchar.h 15 Dec 2011 10:04:36 -0000 @@ -247,16 +247,16 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) #if _GLIBCXX_USE_C99_CHECK || _GLIBCXX_USE_C99_DYNAMIC extern "C" long double - (wcstold)(const wchar_t * restrict, wchar_t ** restrict); + (wcstold)(const wchar_t * __restrict, wchar_t ** __restrict); #endif #if !_GLIBCXX_USE_C99_DYNAMIC using ::wcstold; #endif #if _GLIBCXX_USE_C99_LONG_LONG_CHECK || _GLIBCXX_USE_C99_LONG_LONG_DYNAMIC extern "C" long long int - (wcstoll)(const wchar_t * restrict, wchar_t ** restrict, int); + (wcstoll)(const wchar_t * __restrict, wchar_t ** __restrict, int); extern "C" unsigned long long int - (wcstoull)(const wchar_t * restrict, wchar_t ** restrict, int); + (wcstoull)(const wchar_t * __restrict, wchar_t ** __restrict, int); #endif #if !_GLIBCXX_USE_C99_LONG_LONG_DYNAMIC using ::wcstoll;
