diff options
author | H.J. Lu <hjl.tools@gmail.com> | 2000-06-18 03:08:19 +0400 |
---|---|---|
committer | H.J. Lu <hjl.tools@gmail.com> | 2000-06-18 03:08:19 +0400 |
commit | 20c74690606013f62e8f7fcd909a2e6d584ec9e5 (patch) | |
tree | fd02572401a77cc3382c069c69f712b4cae7fcd7 /include/getopt.h | |
parent | 4a7a5a717ca76c4a17b0107c8b0306dfb1ff63fe (diff) |
2000-06-17 H.J. Lu <hjl@gnu.org>
* getopt.h: Updated from gcc.
* libiberty.h: Likewise.
* symcat.h: Likewise.
Diffstat (limited to 'include/getopt.h')
-rw-r--r-- | include/getopt.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/include/getopt.h b/include/getopt.h index fb30719a8..9620fc706 100644 --- a/include/getopt.h +++ b/include/getopt.h @@ -99,13 +99,20 @@ struct option #define optional_argument 2 #if defined (__STDC__) && __STDC__ -#ifdef __GNU_LIBRARY__ +/* HAVE_DECL_* is a three-state macro: undefined, 0 or 1. If it is + undefined, we haven't run the autoconf check so provide the + declaration without arguments. If it is 0, we checked and failed + to find the declaration so provide a fully prototyped one. If it + is 1, we found it so don't provide any declaration at all. */ +#if defined (__GNU_LIBRARY__) || (defined (HAVE_DECL_GETOPT) && !HAVE_DECL_GETOPT) /* Many other libraries have conflicting prototypes for getopt, with differences in the consts, in stdlib.h. To avoid compilation errors, only prototype getopt for the GNU C library. */ extern int getopt (int argc, char *const *argv, const char *shortopts); #else /* not __GNU_LIBRARY__ */ +# if !defined (HAVE_DECL_GETOPT) extern int getopt (); +# endif #endif /* __GNU_LIBRARY__ */ extern int getopt_long (int argc, char *const *argv, const char *shortopts, const struct option *longopts, int *longind); |