JehanneOS
/
mksh
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

some <getopt.h> from vendors define a “struct option”, so use a 

different name for ours
This commit is contained in:
tg 2007-07-01 16:49:18 +00:00
parent 69f7683156
commit 572119b454
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
misc.c
View File

@ -6,7 +6,7 @@
#include <grp.h> #include <grp.h>
#endif #endif
__RCSID("$MirOS: src/bin/mksh/misc.c,v 1.58 2007/06/15 21:55:19 tg Exp $\t" __RCSID("$MirOS: src/bin/mksh/misc.c,v 1.59 2007/07/01 16:49:17 tg Exp $\t"
MKSH_SH_H_ID); MKSH_SH_H_ID);
#undef USE_CHVT #undef USE_CHVT
@ -98,7 +98,7 @@ Xcheck_grow_(XString *xsp, const char *xp, unsigned more)
return xsp->beg + (xp - old_beg); return xsp->beg + (xp - old_beg);
} }
const struct option options[] = { const struct shoption options[] = {
/* Special cases (see parse_args()): -A, -o, -s. /* Special cases (see parse_args()): -A, -o, -s.
* Options are sorted by their longnames - the order of these * Options are sorted by their longnames - the order of these
* entries MUST match the order of sh_flag F* enumerations in sh.h. * entries MUST match the order of sh_flag F* enumerations in sh.h.

6
sh.h
View File

@ -8,7 +8,7 @@
/* $OpenBSD: c_test.h,v 1.4 2004/12/20 11:34:26 otto Exp $ */ /* $OpenBSD: c_test.h,v 1.4 2004/12/20 11:34:26 otto Exp $ */
/* $OpenBSD: tty.h,v 1.5 2004/12/20 11:34:26 otto Exp $ */ /* $OpenBSD: tty.h,v 1.5 2004/12/20 11:34:26 otto Exp $ */
#define MKSH_SH_H_ID "$MirOS: src/bin/mksh/sh.h,v 1.151 2007/06/27 23:12:59 tg Exp $" #define MKSH_SH_H_ID "$MirOS: src/bin/mksh/sh.h,v 1.152 2007/07/01 16:49:18 tg Exp $"
#define MKSH_VERSION "R29 2007/06/27" #define MKSH_VERSION "R29 2007/06/27"
#if HAVE_SYS_PARAM_H #if HAVE_SYS_PARAM_H
@ -374,12 +374,12 @@ EXTERN struct env {
#define OF_FIRSTTIME 0x10 /* as early as possible, once */ #define OF_FIRSTTIME 0x10 /* as early as possible, once */
#define OF_ANY (OF_CMDLINE | OF_SET | OF_SPECIAL | OF_INTERNAL) #define OF_ANY (OF_CMDLINE | OF_SET | OF_SPECIAL | OF_INTERNAL)
struct option { struct shoption {
const char *name; /* long name of option */ const char *name; /* long name of option */
char c; /* character flag (if any) */ char c; /* character flag (if any) */
unsigned char flags; /* OF_* */ unsigned char flags; /* OF_* */
}; };
extern const struct option options[]; extern const struct shoption options[];
/* /*
* flags (the order of these enums MUST match the order in misc.c(options[])) * flags (the order of these enums MUST match the order in misc.c(options[]))