about summary refs log tree commit diff
path: root/argp
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1999-05-18 08:37:39 +0000
committerUlrich Drepper <drepper@redhat.com>1999-05-18 08:37:39 +0000
commit05cc5bd9dca91dfad3eec076b1bfdfef868f0987 (patch)
tree4a8942bb0c29d63c99e0848686f89c7e23b3de9a /argp
parent73334e85faf2faf44479c4e5d8367d07cca7059f (diff)
downloadglibc-05cc5bd9dca91dfad3eec076b1bfdfef868f0987.tar.gz
glibc-05cc5bd9dca91dfad3eec076b1bfdfef868f0987.tar.xz
glibc-05cc5bd9dca91dfad3eec076b1bfdfef868f0987.zip
Update.
1999-05-04  Zack Weinberg  <zack@rabi.phys.columbia.edu>

	* argp/argp.h, assert/assert.h, misc/sys/cdefs.h,
	posix/sys/types.h: Handle the case of __GNUC__=3,
	__GNUC_MINOR__=(anything).
Diffstat (limited to 'argp')
-rw-r--r--argp/argp.h9
1 files changed, 6 insertions, 3 deletions
diff --git a/argp/argp.h b/argp/argp.h
index eb570f1653..cfa7116fe9 100644
--- a/argp/argp.h
+++ b/argp/argp.h
@@ -1,5 +1,5 @@
 /* Hierarchial argument parsing, layered over getopt.
-   Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Written by Miles Bader <miles@gnu.ai.mit.edu>.
 
@@ -38,13 +38,16 @@ typedef int error_t;
 #endif
 
 #ifndef __P
-# if (defined __STDC__ && __STDC__) || defined __cplusplus
-#  if defined __GNUC__ && defined __cplusplus && __GNUC_MINOR__ >= 8
+# ifdef __cplusplus
+#  if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 7)
 #   define __P(args)	args throw ()
 #  else
 #   define __P(args)	args
 #  endif
 #  define __PMT(args)	args
+# elif defined __STDC__ && __STDC__ > 0
+#  define __P(args)	args
+#  define __PMT(args)	args
 # else
 #  define __P(args)	()
 #  define __PMT(args)	()