From fd4d6b3108d2026603fcfad7b5d845cd3ceedf2a Mon Sep 17 00:00:00 2001
From: Markus Armbruster <armbru@pond.sub.org>
Date: Mon, 30 Aug 2004 17:36:50 +0000
Subject: [PATCH] (keymatch, configkeys): Move to from optlist.h to
 emp_config.c; static linkage.

---
 include/optlist.h        | 12 ------------
 src/lib/gen/emp_config.c | 12 +++++++++++-
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/include/optlist.h b/include/optlist.h
index 05fe84de..b117316a 100644
--- a/include/optlist.h
+++ b/include/optlist.h
@@ -109,16 +109,4 @@ extern s_char *timestampfil;
 extern s_char *teldir;
 extern s_char *telfil;
 
-struct keymatch {
-    s_char *km_key;		/* the key */
-    void (*km_func)(struct keymatch * kp, s_char **av);
-				/* the function to call if matches */
-    void *km_data;		/* associated data */
-    int km_flags;		/* useful flags */
-#define KM_ALLOC	0x01	/* memory allocated */
-    s_char *km_comment;		/* Comment (hopefully useful) */
-};
-
-extern struct keymatch configkeys[];
-
 #endif /* _OPTLIST_H_ */
diff --git a/src/lib/gen/emp_config.c b/src/lib/gen/emp_config.c
index 287a25a4..76536c95 100644
--- a/src/lib/gen/emp_config.c
+++ b/src/lib/gen/emp_config.c
@@ -60,6 +60,16 @@
 extern char *strdup();
 #endif /* NOSTRDUP */
 
+struct keymatch {
+    s_char *km_key;		/* the key */
+    void (*km_func)(struct keymatch * kp, s_char **av);
+				/* the function to call if matches */
+    void *km_data;		/* associated data */
+    int km_flags;		/* useful flags */
+#define KM_ALLOC	0x01	/* memory allocated */
+    s_char *km_comment;		/* Comment (hopefully useful) */
+};
+
 /* Dummy one */
 static int emp_config_dummy;
 
@@ -73,7 +83,7 @@ static void optiondel(struct keymatch *kp, s_char **av);
 static void worldxset(struct keymatch *kp, s_char **av);
 
 /* things that can be changed */
-struct keymatch configkeys[] = {
+static struct keymatch configkeys[] = {
 #define	EMP_CONFIG_C_OUTPUT
 #include "econfig-spec.h"
 #undef	EMP_CONFIG_C_OUTPUT