diff options
| -rw-r--r-- | libstdc++-v3/ChangeLog | 8 | ||||
| -rw-r--r-- | libstdc++-v3/include/c_global/cstdio | 11 | ||||
| -rw-r--r-- | libstdc++-v3/include/c_global/cstdlib | 4 | ||||
| -rw-r--r-- | libstdc++-v3/include/c_std/cstdio | 11 | ||||
| -rw-r--r-- | libstdc++-v3/include/c_std/cstdlib | 4 |
5 files changed, 24 insertions, 14 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index fa90d4d..cb551ad 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,11 @@ +2010-08-16 Paolo Carlini <paolo.carlini@oracle.com> + + PR libstdc++/45300 + * include/c_std/cstdlib: Replace 'restrict' -> '__restrict'. + * include/c_std/cstdio: Likewise. + * include/c_global/cstdlib: Likewise. + * include/c_global/cstdio: Likewise. + 2010-08-16 Chris Moller <cmoller@redhat.com> http://sourceware.org/bugzilla/show_bug.cgi?id=11874 diff --git a/libstdc++-v3/include/c_global/cstdio b/libstdc++-v3/include/c_global/cstdio index b547fbe..9124229 100644 --- a/libstdc++-v3/include/c_global/cstdio +++ b/libstdc++-v3/include/c_global/cstdio @@ -150,15 +150,16 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) #if _GLIBCXX_USE_C99_CHECK || _GLIBCXX_USE_C99_DYNAMIC extern "C" int - (snprintf)(char * restrict, std::size_t, const char * restrict, ...) throw (); + (snprintf)(char * __restrict, std::size_t, const char * __restrict, ...) + throw (); 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, std::size_t, const char * restrict, + (vsnprintf)(char * __restrict, std::size_t, const char * __restrict, __gnuc_va_list) throw (); extern "C" int - (vsscanf)(const char * restrict, const char * restrict, __gnuc_va_list) + (vsscanf)(const char * __restrict, const char * __restrict, __gnuc_va_list) throw (); #endif diff --git a/libstdc++-v3/include/c_global/cstdlib b/libstdc++-v3/include/c_global/cstdlib index da95c0f..943f263 100644 --- a/libstdc++-v3/include/c_global/cstdlib +++ b/libstdc++-v3/include/c_global/cstdlib @@ -181,9 +181,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 *) throw (); extern "C" long long int - (strtoll)(const char * restrict, char ** restrict, int) throw (); + (strtoll)(const char * __restrict, char ** __restrict, int) throw (); extern "C" unsigned long long int - (strtoull)(const char * restrict, char ** restrict, int) throw (); + (strtoull)(const char * __restrict, char ** __restrict, int) throw (); #endif #if !_GLIBCXX_USE_C99_LONG_LONG_DYNAMIC using ::atoll; diff --git a/libstdc++-v3/include/c_std/cstdio b/libstdc++-v3/include/c_std/cstdio index 4a8acdd..6f648ad 100644 --- a/libstdc++-v3/include/c_std/cstdio +++ b/libstdc++-v3/include/c_std/cstdio @@ -149,15 +149,16 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) #if _GLIBCXX_USE_C99_CHECK || _GLIBCXX_USE_C99_DYNAMIC extern "C" int - (snprintf)(char * restrict, std::size_t, const char * restrict, ...) throw (); + (snprintf)(char * __restrict, std::size_t, const char * __restrict, ...) + throw (); 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, std::size_t, const char * restrict, + (vsnprintf)(char * __restrict, std::size_t, const char * __restrict, __gnuc_va_list) throw (); extern "C" int - (vsscanf)(const char * restrict, const char * restrict, __gnuc_va_list) + (vsscanf)(const char * __restrict, const char * __restrict, __gnuc_va_list) throw (); #endif diff --git a/libstdc++-v3/include/c_std/cstdlib b/libstdc++-v3/include/c_std/cstdlib index 734745a..443f1e7 100644 --- a/libstdc++-v3/include/c_std/cstdlib +++ b/libstdc++-v3/include/c_std/cstdlib @@ -180,9 +180,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 *) throw (); extern "C" long long int - (strtoll)(const char * restrict, char ** restrict, int) throw (); + (strtoll)(const char * __restrict, char ** __restrict, int) throw (); extern "C" unsigned long long int - (strtoull)(const char * restrict, char ** restrict, int) throw (); + (strtoull)(const char * __restrict, char ** __restrict, int) throw (); #endif #if !_GLIBCXX_USE_C99_LONG_LONG_DYNAMIC using ::atoll; |