Mercurial > hg > octave-lojdl > gnulib-hg
changeset 8537:3b154c967284
Avoid circular definition restrict -> __restrict -> restrict on BeOS.
author | Bruno Haible <bruno@clisp.org> |
---|---|
date | Sun, 25 Mar 2007 17:53:39 +0000 |
parents | 6d78c804e54f |
children | ed093c9442f9 |
files | ChangeLog lib/argp.h |
diffstat | 2 files changed, 10 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-03-25 Bruno Haible <bruno@clisp.org> + + * lib/argp.h (__restrict): Define to empty, rather than to 'restrict', + if the compiler does not support C99. + 2007-03-25 Bruno Haible <bruno@clisp.org> * modules/time (Makefile.am): Ensure all rule action lines start with a
--- 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 <miles@gnu.ai.mit.edu>. @@ -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