Patchwork [v3] libstdc++/45300

login
register
mail settings
Submitter Paolo Carlini
Date Aug. 16, 2010, 7:03 p.m.
Message ID <4C698B70.2070901@oracle.com>
Download mbox | patch
Permalink /patch/61828/
State New
Headers show

Comments

Paolo Carlini - Aug. 16, 2010, 7:03 p.m.
Hi,

tested x86_64-linux, committed to mainline.

Paolo.

///////////////////////
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.

Patch

Index: include/c_std/cstdlib
===================================================================
--- include/c_std/cstdlib	(revision 163281)
+++ include/c_std/cstdlib	(working copy)
@@ -180,9 +180,9 @@ 
 #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;
Index: include/c_std/cstdio
===================================================================
--- include/c_std/cstdio	(revision 163281)
+++ include/c_std/cstdio	(working copy)
@@ -149,15 +149,16 @@ 
 
 #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
 
Index: include/c_global/cstdlib
===================================================================
--- include/c_global/cstdlib	(revision 163281)
+++ include/c_global/cstdlib	(working copy)
@@ -181,9 +181,9 @@ 
 #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;
Index: include/c_global/cstdio
===================================================================
--- include/c_global/cstdio	(revision 163281)
+++ include/c_global/cstdio	(working copy)
@@ -150,15 +150,16 @@ 
 
 #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