From 246c84b9f3237ace1bbbae83d9f5a8099ac823d8 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 25 Mar 2007 17:53:39 +0000 Subject: [PATCH] Avoid circular definition restrict -> __restrict -> restrict on BeOS. --- ChangeLog | 5 +++++ lib/argp.h | 8 +++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6b40c705d..1d44aeb21 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2007-03-25 Bruno Haible + * lib/argp.h (__restrict): Define to empty, rather than to 'restrict', + if the compiler does not support C99. + +2007-03-25 Bruno Haible + * modules/time (Makefile.am): Ensure all rule action lines start with a tab. diff --git a/lib/argp.h b/lib/argp.h index 13b0cddc8..1c4e06f8f 100644 --- a/lib/argp.h +++ b/lib/argp.h @@ -1,5 +1,5 @@ /* Hierarchial argument parsing, layered over getopt. - Copyright (C) 1995-1999,2003-2006 Free Software Foundation, Inc. + Copyright (C) 1995-1999,2003-2007 Free Software Foundation, Inc. This file is part of the GNU C Library. Written by Miles Bader . @@ -49,10 +49,12 @@ #endif /* GCC 2.95 and later have "__restrict"; C99 compilers have - "restrict", and "configure" may have defined "restrict". */ + "restrict", and "configure" may have defined "restrict". + Other compilers use __restrict, __restrict__, and _Restrict, and + 'configure' might #define 'restrict' to those words. */ #ifndef __restrict # if ! (2 < __GNUC__ || (2 == __GNUC__ && 95 <= __GNUC_MINOR__)) -# if defined restrict || 199901L <= __STDC_VERSION__ +# if 199901L <= __STDC_VERSION__ # define __restrict restrict # else # define __restrict -- 2.11.0