diff options
| author | Dale Rahn <drahn@cvs.openbsd.org> | 2004-05-19 22:12:05 +0000 |
|---|---|---|
| committer | Dale Rahn <drahn@cvs.openbsd.org> | 2004-05-19 22:12:05 +0000 |
| commit | 9ebc6294971ff651a6538c34f76c110b90eb2e18 (patch) | |
| tree | 02c25fbd6b5d63b54e7fbb6af747e6f84fb9ee51 /gnu | |
| parent | 5ddf48e85619d5b384378cb8d0be6a01b727c32d (diff) | |
Remove a build warning by reverting to old method of testing for
HAVE_DECL_GETOPT. pointed out by a few.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/usr.bin/binutils/include/getopt.h | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/gnu/usr.bin/binutils/include/getopt.h b/gnu/usr.bin/binutils/include/getopt.h index a99a2290159..beaac5d75d0 100644 --- a/gnu/usr.bin/binutils/include/getopt.h +++ b/gnu/usr.bin/binutils/include/getopt.h @@ -105,19 +105,16 @@ 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 !HAVE_DECL_GETOPT -#if defined (__GNU_LIBRARY__) || defined (HAVE_DECL_GETOPT) +#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 unistd.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 -#ifndef __cplusplus +#else /* not __GNU_LIBRARY__ */ +# if !defined (HAVE_DECL_GETOPT) extern int getopt (); -#endif /* __cplusplus */ -#endif -#endif /* !HAVE_DECL_GETOPT */ - +# endif +#endif /* __GNU_LIBRARY__ */ 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, |