Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 1 | From 19b581056c1709f7d2872cd76b977542a0fe6142 Mon Sep 17 00:00:00 2001 |
Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Tue, 10 May 2016 08:47:05 -0700 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 4 | Subject: [PATCH 10/11] resolve restrict keyword conflict |
Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 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 | gdb/gnulib/import/sys_time.in.h | 8 ++++---- |
| 15 | 1 file changed, 4 insertions(+), 4 deletions(-) |
| 16 | |
| 17 | diff --git a/gdb/gnulib/import/sys_time.in.h b/gdb/gnulib/import/sys_time.in.h |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 18 | index b4a0e49c50..d22cea9aaf 100644 |
Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 19 | --- a/gdb/gnulib/import/sys_time.in.h |
| 20 | +++ b/gdb/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); |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 45 | # if defined __cplusplus && defined GNULIB_NAMESPACE |
Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 46 | -- |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 47 | 2.18.0 |
Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 48 | |