summaryrefslogtreecommitdiff
path: root/lib/argp.h
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2007-03-25 17:53:39 +0000
committerBruno Haible <bruno@clisp.org>2007-03-25 17:53:39 +0000
commit246c84b9f3237ace1bbbae83d9f5a8099ac823d8 (patch)
tree6e71c85c6a16da56caa527b72eda3616c577759d /lib/argp.h
parent69abfab6749722c09b79cf63e1ae6ba328445871 (diff)
downloadgnulib-246c84b9f3237ace1bbbae83d9f5a8099ac823d8.tar.gz
Avoid circular definition restrict -> __restrict -> restrict on BeOS.
Diffstat (limited to 'lib/argp.h')
-rw-r--r--lib/argp.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/argp.h b/lib/argp.h
index 13b0cddc88..1c4e06f8fe 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 <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