diff options
| author | cvs2svn <> | 2002-07-12 00:14:42 +0400 |
|---|---|---|
| committer | cvs2svn <> | 2002-07-12 00:14:42 +0400 |
| commit | ce122f0260fafd437209005104cb0d6cf24b6817 (patch) | |
| tree | d5d0e21b67988b568d0630adec47856777c01b88 /include/getopt.h | |
| parent | 357281c75d7dbd491a9ce39121d36c2f0708cb51 (diff) | |
This commit was manufactured by cvs2svn to create branch 'binutils-binutils-2_13-branchpoint
2_13-branch'.
Sprout from kseitz_interps-20020528-branch 2002-06-18 21:15:59 UTC cvs2svn 'This commit was manufactured by cvs2svn to create branch'
Cherrypick from master 2002-07-11 20:14:41 UTC DJ Delorie <dj@redhat.com> '* configure.in: Remove two redundant tests.':
COPYING.LIBGLOSS
ChangeLog
Makefile.in
config-ml.in
config.sub
config/ChangeLog
configure
configure.in
etc/ChangeLog
etc/texi2pod.pl
include/ChangeLog
include/bfdlink.h
include/demangle.h
include/dis-asm.h
include/elf/ChangeLog
include/elf/alpha.h
include/elf/common.h
include/elf/dwarf2.h
include/elf/sh.h
include/elf/vax.h
include/fibheap.h
include/gdb/ChangeLog
include/gdb/sim-d10v.h
include/getopt.h
include/hashtab.h
include/libiberty.h
include/opcode/ChangeLog
include/opcode/a29k.h
include/opcode/convex.h
include/opcode/dlx.h
include/opcode/i386.h
include/opcode/mips.h
include/opcode/or32.h
include/partition.h
include/sort.h
include/splay-tree.h
ltcf-cxx.sh
Delete:
include/callback.h
include/remote-sim.h
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, |