From 572119b45449e4c0ed31013b52ecef0acac60a17 Mon Sep 17 00:00:00 2001
From: tg <tg@mirbsd.org>
Date: Sun, 1 Jul 2007 16:49:18 +0000
Subject: [PATCH] =?UTF-8?q?some=20<getopt.h>=20from=20vendors=20define=20a?=
 =?UTF-8?q?=20=E2=80=9Cstruct=20option=E2=80=9D,=20so=20use=20a=20differen?=
 =?UTF-8?q?t=20name=20for=20ours?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 misc.c | 4 ++--
 sh.h   | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/misc.c b/misc.c
index 2c9cdef..88cf973 100644
--- a/misc.c
+++ b/misc.c
@@ -6,7 +6,7 @@
 #include <grp.h>
 #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);
 
 #undef USE_CHVT
@@ -98,7 +98,7 @@ Xcheck_grow_(XString *xsp, const char *xp, unsigned more)
 	return xsp->beg + (xp - old_beg);
 }
 
-const struct option options[] = {
+const struct shoption 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/sh.h b/sh.h
index 8b40d0d..ef376df 100644
--- a/sh.h
+++ b/sh.h
@@ -8,7 +8,7 @@
 /*	$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 $	*/
 
-#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"
 
 #if HAVE_SYS_PARAM_H
@@ -374,12 +374,12 @@ EXTERN struct env {
 #define OF_FIRSTTIME	0x10	/* as early as possible, once */
 #define OF_ANY		(OF_CMDLINE | OF_SET | OF_SPECIAL | OF_INTERNAL)
 
-struct option {
+struct shoption {
 	const char *name;	/* long name of option */
 	char c;			/* character flag (if any) */
 	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[]))