diff options
| author | DJ Delorie <dj@redhat.com> | 2002-06-24 17:39:28 +0000 |
|---|---|---|
| committer | DJ Delorie <dj@redhat.com> | 2002-06-24 17:39:28 +0000 |
| commit | 931f285fb1aac3221b7cbf8c360fb06442772bba (patch) | |
| tree | 50f81f5486b2edcc3f4e1069d98822e630c2ed7e /include/getopt.h | |
| parent | 65044526557bc54ac5b326bed9ee936c6d2feeb0 (diff) | |
| download | fsf-binutils-gdb-931f285fb1aac3221b7cbf8c360fb06442772bba.zip fsf-binutils-gdb-931f285fb1aac3221b7cbf8c360fb06442772bba.tar.gz fsf-binutils-gdb-931f285fb1aac3221b7cbf8c360fb06442772bba.tar.bz2 | |
merge from gcc
Diffstat (limited to 'include/getopt.h')
| -rw-r--r-- | include/getopt.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/include/getopt.h b/include/getopt.h index cb5feba..0c6470b 100644 --- a/include/getopt.h +++ b/include/getopt.h @@ -105,16 +105,17 @@ struct option 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) +#if !HAVE_DECL_GETOPT +#if defined (__GNU_LIBRARY__) || defined (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) +#else extern int getopt (); -# endif -#endif /* __GNU_LIBRARY__ */ +#endif +#endif /* !HAVE_DECL_GETOPT */ + extern int getopt_long (int argc, char *const *argv, const char *shortopts, const struct option *longopts, int *longind); extern int getopt_long_only (int argc, char *const *argv, |