aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDuncaen <mail@duncano.de>2017-05-24 16:51:20 +0200
committerDuncaen <mail@duncano.de>2017-05-24 16:51:20 +0200
commit05d48b2df2929b9d4f7b420463c4695ed1c09e53 (patch)
treecb3d56b94bbb43a6a8ddccaf0b676526861b7716
parenta946ef146fb9cc0e9a14651f84ddb6035a3064e5 (diff)
downloadlobase-05d48b2df2929b9d4f7b420463c4695ed1c09e53.tar.gz
bin/ksh: revert changes to avoid conflicts
-rw-r--r--bin/ksh/misc.c2
-rw-r--r--bin/ksh/sh.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/bin/ksh/misc.c b/bin/ksh/misc.c
index f172f07..9ef6e64 100644
--- a/bin/ksh/misc.c
+++ b/bin/ksh/misc.c
@@ -115,7 +115,7 @@ Xcheck_grow_(XString *xsp, char *xp, int more)
return xsp->beg + (xp - old_beg);
}
-const struct ksh_option options[] = {
+const struct option options[] = {
/* Special cases (see parse_args()): -A, -o, -s.
* Options are sorted by their longnames - the order of these
* entries MUST match the order of sh_flag F* enumerations in sh.h.
diff --git a/bin/ksh/sh.h b/bin/ksh/sh.h
index 6491ce7..400f511 100644
--- a/bin/ksh/sh.h
+++ b/bin/ksh/sh.h
@@ -119,12 +119,12 @@ extern struct env *genv;
#define OF_INTERNAL 0x08 /* set internally by shell */
#define OF_ANY (OF_CMDLINE | OF_SET | OF_SPECIAL | OF_INTERNAL)
-struct ksh_option {
+struct option {
const char *name; /* long name of option */
char c; /* character flag (if any) */
short flags; /* OF_* */
};
-extern const struct ksh_option options[];
+extern const struct option options[];
/*
* flags (the order of these enums MUST match the order in misc.c(options[]))