diff options
| author | DJ Delorie <dj@redhat.com> | 2002-06-24 21:39:28 +0400 |
|---|---|---|
| committer | DJ Delorie <dj@redhat.com> | 2002-06-24 21:39:28 +0400 |
| commit | caaac2d1f4129f83a939e21e8f1b5cdb567ade79 (patch) | |
| tree | b1a118df2b4b001aa118df8df9464207a2e26710 /include/getopt.h | |
| parent | 3118725a60afb8a1093abaf4371fa32b7d71247f (diff) | |
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 cb5feba11..0c6470b3d 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, |