diff options
| author | Jim Meyering <jim@meyering.net> | 2003-09-10 08:44:28 +0000 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 2003-09-10 08:44:28 +0000 |
| commit | 9209af4c98b697cc74dfea1d4afb2f56849cf9ce (patch) | |
| tree | 4979fcbf96ab42c6e38af2413ab17c53fe680643 | |
| parent | 8f4368f10bbd734b9457debd450dbf95c0fbf39a (diff) | |
| download | coreutils-9209af4c98b697cc74dfea1d4afb2f56849cf9ce.tar.xz | |
(struct option.name): Assume C89, and use 'const'.
(getopt, etopt_long, getopt_long_only, _getopt_internal)
[defined __GNU_LIBRARY__]: Assume C89, so we can always declare
with a prototype.
| -rw-r--r-- | lib/getopt.h | 29 |
1 files changed, 9 insertions, 20 deletions
diff --git a/lib/getopt.h b/lib/getopt.h index f344e7d0d..5e15191e6 100644 --- a/lib/getopt.h +++ b/lib/getopt.h @@ -1,5 +1,8 @@ /* Declarations for getopt. - Copyright (C) 1989-1994, 1996-1999, 2001 Free Software Foundation, Inc. + + Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 1996, 1997, 1998, + 1999, 2001, 2003 Free Software Foundation, Inc. + This file is part of the GNU C Library. This program is free software; you can redistribute it and/or modify @@ -92,11 +95,7 @@ extern int optopt; struct option { -# if (defined __STDC__ && __STDC__) || defined __cplusplus const char *name; -# else - char *name; -# endif /* has_arg can't be an enum because some compilers complain about type mismatches in all the code that assumes it is an int. */ int has_arg; @@ -136,17 +135,16 @@ struct option arguments to the option '\0'. This behavior is specific to the GNU `getopt'. */ -#if (defined __STDC__ && __STDC__) || defined __cplusplus -# ifdef __GNU_LIBRARY__ +#ifdef __GNU_LIBRARY__ /* 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__ */ +#else /* not __GNU_LIBRARY__ */ extern int getopt (); -# endif /* __GNU_LIBRARY__ */ +#endif /* __GNU_LIBRARY__ */ -# ifndef __need_getopt +#ifndef __need_getopt extern int getopt_long (int ___argc, char *const *___argv, const char *__shortopts, const struct option *__longopts, int *__longind); @@ -159,16 +157,7 @@ extern int _getopt_internal (int ___argc, char *const *___argv, const char *__shortopts, const struct option *__longopts, int *__longind, int __long_only); -# endif -#else /* not __STDC__ */ -extern int getopt (); -# ifndef __need_getopt -extern int getopt_long (); -extern int getopt_long_only (); - -extern int _getopt_internal (); -# endif -#endif /* __STDC__ */ +#endif #ifdef __cplusplus } |