move keymap declaration stuff to a common header

3 files changed, 14 insertions, 29 deletions

diff --git a/isys/lang.c b/isys/lang.c
index 5d3f82868..7de53be20 100644
--- a/isys/lang.c
+++ b/isys/lang.c
@@ -51,20 +51,6 @@ int isysLoadFont(char * fontFile) {
     return 0;
 }
 
-/* define ask johnsonm@redhat.com where this came from */
-#define KMAP_MAGIC 0x8B39C07F
-#define KMAP_NAMELEN 40         /* including '\0' */
-
-struct kmapHeader {
-    int magic;
-    int numEntries;
-};
-        
-struct kmapInfo {
-    int size;
-    char name[KMAP_NAMELEN];
-};
-
 /* the file pointer must be at the beginning of the section already! */
 int loadKeymap(gzFile stream) {
     int console;
diff --git a/isys/lang.h b/isys/lang.h
index b2e377c5d..2aa1d5605 100644
--- a/isys/lang.h
+++ b/isys/lang.h
@@ -3,6 +3,20 @@
 
 #include "stubs.h"
 
+/* define ask johnsonm@redhat.com where this came from */
+#define KMAP_MAGIC 0x8B39C07F
+#define KMAP_NAMELEN 40         /* including '\0' */
+
+struct kmapHeader {
+    int magic;
+    int numEntries;
+};
+        
+struct kmapInfo {
+    int size;
+    char name[KMAP_NAMELEN];
+};
+
 int loadKeymap(gzFile stream);
 int isysLoadFont(char * fontFile);
 int isysLoadKeymap(char * keymap);
diff --git a/loader2/kbd.c b/loader2/kbd.c
index 94fc6c073..770bd9ed7 100644
--- a/loader2/kbd.c
+++ b/loader2/kbd.c
@@ -31,21 +31,6 @@
 #include "../isys/stubs.h"
 #include "../isys/lang.h"
 
-/* JKFIXME: these should just be included from isys somehow.. */
-/* define ask johnsonm@redhat.com where this came from */
-#define KMAP_MAGIC 0x8B39C07F
-#define KMAP_NAMELEN 40         /* including '\0' */
-
-struct kmapHeader {
-    int magic;
-    int numEntries;
-};
-
-struct kmapInfo {
-    int size;
-    char name[KMAP_NAMELEN];
-};
-
 int chooseKeyboard(char ** keymap, char ** kbdtypep, int flags) {
     int num = -1;
     int rc;