diff options
| author |   pascal <pascal@openbsd.org> | 2011-12-15 23:31:37 +0000 |
|---|---|---|
| committer | pascal <pascal@openbsd.org> | 2011-12-15 23:31:37 +0000 |
| commit | 6570f8749eb85e92180967d0b1ee9911b31bfb63 (patch) | |
| tree | 5e40dbba5cf9122c7a3ba497d16b0a2cd2b028d7 | |
| parent | Remove the XXX_CHECK defines. This allows clang++ to include cstdio (diff) | |
| download | wireguard-openbsd-6570f8749eb85e92180967d0b1ee9911b31bfb63.tar.xz wireguard-openbsd-6570f8749eb85e92180967d0b1ee9911b31bfb63.zip | |
Convert restrict -> __restrict. "restrict" is not a keyword in C90 and
C++98, so clang++ rightfully complains about it when in C++98 mode (the
default).
Found while investigating the other clang issue, with helpful input from
espie@.
ok jsg@
| -rw-r--r-- | gnu/gcc/libstdc++-v3/include/c_std/std_cstdio.h | 10 | ||||
| -rw-r--r-- | gnu/gcc/libstdc++-v3/include/c_std/std_cstdlib.h | 4 | ||||
| -rw-r--r-- | gnu/gcc/libstdc++-v3/include/c_std/std_cwchar.h | 6 |
3 files changed, 10 insertions, 10 deletions
diff --git a/gnu/gcc/libstdc++-v3/include/c_std/std_cstdio.h b/gnu/gcc/libstdc++-v3/include/c_std/std_cstdio.h index 3935ef4f17e..6ece84ea175 100644 --- a/gnu/gcc/libstdc++-v3/include/c_std/std_cstdio.h +++ b/gnu/gcc/libstdc++-v3/include/c_std/std_cstdio.h @@ -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 diff --git a/gnu/gcc/libstdc++-v3/include/c_std/std_cstdlib.h b/gnu/gcc/libstdc++-v3/include/c_std/std_cstdlib.h index 5c3d586c0e6..19dc0038e19 100644 --- a/gnu/gcc/libstdc++-v3/include/c_std/std_cstdlib.h +++ b/gnu/gcc/libstdc++-v3/include/c_std/std_cstdlib.h @@ -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; diff --git a/gnu/gcc/libstdc++-v3/include/c_std/std_cwchar.h b/gnu/gcc/libstdc++-v3/include/c_std/std_cwchar.h index 20cb8041e79..44e11cb8eb1 100644 --- a/gnu/gcc/libstdc++-v3/include/c_std/std_cwchar.h +++ b/gnu/gcc/libstdc++-v3/include/c_std/std_cwchar.h @@ -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; |