diff options
| author | cvs2svn <> | 2002-11-15 01:42:37 +0300 |
|---|---|---|
| committer | cvs2svn <> | 2002-11-15 01:42:37 +0300 |
| commit | ba23bdcc321e9bf6c4e643814cf6ee37c86c5c50 (patch) | |
| tree | 7026c59d151cb150ad58a6d769c656b3c69ff5cd /include/getopt.h | |
| parent | d1109236e2835bec428fd7779bdb9b673aeec7fb (diff) | |
This commit was manufactured by cvs2svn to create tagcarlton_dictionary-20021115-merge
'carlton_dictionary-20021115-merge'.
Sprout from drow-cplus-branch 2002-10-03 19:08:54 UTC cvs2svn 'This commit was manufactured by cvs2svn to create branch 'drow-cplus-'
Cherrypick from master 2002-11-14 22:42:36 UTC DJ Delorie <dj@redhat.com> '* Makefile.tpl: syntactic cleanup':
ChangeLog
Makefile.def
Makefile.in
Makefile.tpl
config/ChangeLog
configure.in
include/ChangeLog
include/ansidecl.h
include/bfdlink.h
include/elf/ChangeLog
include/elf/sh.h
include/getopt.h
include/opcode/ChangeLog
include/opcode/cgen.h
include/opcode/tic4x.h
include/partition.h
Delete:
config/mpw-mh-mpw
config/mpw/ChangeLog
config/mpw/MoveIfChange
config/mpw/README
config/mpw/forward-include
config/mpw/g-mpw-make.sed
config/mpw/mpw-touch
config/mpw/mpw-true
config/mpw/null-command
config/mpw/open-brace
config/mpw/tr-7to8-src
config/mpw/true
Diffstat (limited to 'include/getopt.h')
| -rw-r--r-- | include/getopt.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/include/getopt.h b/include/getopt.h index 0c6470b3d..a99a22901 100644 --- a/include/getopt.h +++ b/include/getopt.h @@ -1,6 +1,6 @@ /* Declarations for getopt. - Copyright 1989, 1990, 1991, 1992, 1993, 1994, 1996, 1997, 1998, 2000 - Free Software Foundation, Inc. + Copyright 1989, 1990, 1991, 1992, 1993, 1994, 1996, 1997, 1998, 2000, + 2002 Free Software Foundation, Inc. NOTE: The canonical source of this file is maintained with the GNU C Library. Bugs can be reported to bug-glibc@gnu.org. @@ -108,11 +108,13 @@ struct option #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 + 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 extern int getopt (); +#endif /* __cplusplus */ #endif #endif /* !HAVE_DECL_GETOPT */ |