projects
/
deliverable
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
PR c++/16597
[deliverable/binutils-gdb.git]
/
include
/
getopt.h
diff --git
a/include/getopt.h
b/include/getopt.h
index 04e1d9e186180f740b6381825c908616031562f1..5421cabed82290ec9a17159e79a886108c929c74 100644
(file)
--- a/
include/getopt.h
+++ b/
include/getopt.h
@@
-1,6
+1,6
@@
/* Declarations for getopt.
/* Declarations for getopt.
- Copyright 1989, 1990, 1991, 1992, 1993, 199
8, 2000
- Free Software Foundation, Inc.
+ Copyright 1989, 1990, 1991, 1992, 1993, 199
4, 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.
NOTE: The canonical source of this file is maintained with the GNU C Library.
Bugs can be reported to bug-glibc@gnu.org.
@@
-17,7
+17,7
@@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 5
9 Temple Place - Suite 330, Boston, MA 02111-1307
,
+ Foundation, Inc., 5
1 Franklin Street - Fifth Floor, Boston, MA 02110-1301
,
USA. */
#ifndef _GETOPT_H
USA. */
#ifndef _GETOPT_H
@@
-105,16
+105,19
@@
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. */
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
/* 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);
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
+#
ifndef __cplusplus
extern int getopt ();
extern int getopt ();
-# endif
-#endif /* __GNU_LIBRARY__ */
+#endif /* __cplusplus */
+#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,
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,
This page took
0.024009 seconds
and
4
git commands to generate.