OpenE2K/binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* getopt.h (struct option): RMS decided we should do it the other way.

Browse Source
This commit is contained in:
John Gilmore 1992-10-16 10:20:52 +00:00
parent 5a56198d68
commit 0a9266896a
2 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/ChangeLog
View File

@ -1,3 +1,8 @@
Fri Oct 16 03:17:08 1992 John Gilmore (gnu@cygnus.com)
* getopt.h (struct option): RMS decided we should do it the
other way.
Thu Oct 15 21:43:22 1992 K. Richard Pixley (rich@sendai.cygnus.com)
* getopt.h (struct option): use the provided enum for has_arg.

26
include/getopt.h
View File

@ -70,15 +70,6 @@ extern int opterr;
one). For long options that have a zero `flag' field, `getopt'
returns the contents of the `val' field. */
/* Names for the values of the `has_arg' field of `struct option'. */
enum _argtype
{
no_argument,
required_argument,
optional_argument
};
struct option
{
#if __STDC__
@ -88,11 +79,26 @@ struct option
#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. */
enum _argtype has_arg;
int has_arg;
int *flag;
int val;
};
/* Names for the values of the `has_arg' field of `struct option'.
We wouldn't mind doing this:
enum _argtype
{
no_argument,
required_argument,
optional_argument
};
...if we could also change the "int has_arg" above. For now, use
defines. */
#define no_argument 0
#define required_argument 1
#define optional_argument 2
#if __STDC__
extern int getopt (int argc, char *const *argv, const char *shortopts);
extern int getopt_long (int argc, char *const *argv, const char *shortopts,