blob: 809d52f250bc76690da15309d7303b156ac78dbc [file] [log] [blame]
Brad Bishop1a4b7ee2018-12-16 17:11:34 -08001From 19b581056c1709f7d2872cd76b977542a0fe6142 Mon Sep 17 00:00:00 2001
Patrick Williamsc0f7c042017-02-23 20:41:17 -06002From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 10 May 2016 08:47:05 -0700
Brad Bishop1a4b7ee2018-12-16 17:11:34 -08004Subject: [PATCH 10/11] resolve restrict keyword conflict
Patrick Williamsc0f7c042017-02-23 20:41:17 -06005
6GCC detects that we call 'restrict' as param name in function
7signatures and complains since both params are called 'restrict'
8therefore we use __restrict to denote the C99 keywork
9
10Upstream-Status: Pending
11
12Signed-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
17diff --git a/gdb/gnulib/import/sys_time.in.h b/gdb/gnulib/import/sys_time.in.h
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080018index b4a0e49c50..d22cea9aaf 100644
Patrick Williamsc0f7c042017-02-23 20:41:17 -060019--- 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 Bishopd7bf8c12018-02-25 22:55:05 -050045 # if defined __cplusplus && defined GNULIB_NAMESPACE
Patrick Williamsc0f7c042017-02-23 20:41:17 -060046--
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800472.18.0
Patrick Williamsc0f7c042017-02-23 20:41:17 -060048