Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame^] | 1 | From 4ee7e8afb9ff259e889ac938c673fda9ddc5e15a Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Tue, 10 May 2016 08:47:05 -0700 |
| 4 | Subject: [PATCH 08/10] resolve restrict keyword conflict |
| 5 | |
| 6 | GCC detects that we call 'restrict' as param name in function |
| 7 | signatures and complains since both params are called 'restrict' |
| 8 | therefore we use __restrict to denote the C99 keywork |
| 9 | |
| 10 | Upstream-Status: Pending |
| 11 | |
| 12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 13 | --- |
| 14 | gnulib/import/sys_time.in.h | 8 ++++---- |
| 15 | 1 file changed, 4 insertions(+), 4 deletions(-) |
| 16 | |
| 17 | diff --git a/gnulib/import/sys_time.in.h b/gnulib/import/sys_time.in.h |
| 18 | index 90a67d18426..664641a1fe8 100644 |
| 19 | --- a/gnulib/import/sys_time.in.h |
| 20 | +++ b/gnulib/import/sys_time.in.h |
| 21 | @@ -93,20 +93,20 @@ struct timeval |
| 22 | # define gettimeofday rpl_gettimeofday |
| 23 | # endif |
| 24 | _GL_FUNCDECL_RPL (gettimeofday, int, |
| 25 | - (struct timeval *restrict, void *restrict) |
| 26 | + (struct timeval *__restrict, void *__restrict) |
| 27 | _GL_ARG_NONNULL ((1))); |
| 28 | _GL_CXXALIAS_RPL (gettimeofday, int, |
| 29 | - (struct timeval *restrict, void *restrict)); |
| 30 | + (struct timeval *__restrict, void *__restrict)); |
| 31 | # else |
| 32 | # if !@HAVE_GETTIMEOFDAY@ |
| 33 | _GL_FUNCDECL_SYS (gettimeofday, int, |
| 34 | - (struct timeval *restrict, void *restrict) |
| 35 | + (struct timeval *__restrict, void *__restrict) |
| 36 | _GL_ARG_NONNULL ((1))); |
| 37 | # endif |
| 38 | /* Need to cast, because on glibc systems, by default, the second argument is |
| 39 | struct timezone *. */ |
| 40 | _GL_CXXALIAS_SYS_CAST (gettimeofday, int, |
| 41 | - (struct timeval *restrict, void *restrict)); |
| 42 | + (struct timeval *__restrict, void *__restrict)); |
| 43 | # endif |
| 44 | _GL_CXXALIASWARN (gettimeofday); |
| 45 | # if defined __cplusplus && defined GNULIB_NAMESPACE |
| 46 | -- |
| 47 | 2.33.1 |
| 48 | |