tag 317861 patch
thanks
The attached patch fixes this bug. OK to commit?
--
Matt
Index: keyboard.h
===
--- keyboard.h (revision 0)
+++ keyboard.h (revision 0)
@@ -0,0 +1,25 @@
+/* Macro definitions from linux/keyboard.h. */
+#define MAX_NR_KEYMAPS 256
+#define MAX_NR_FUNC 256
+#define MAX_DIACR 256
+
+#define KG_SHIFT 0
+#define KG_CTRL 2
+#define KG_ALT 3
+#define KG_ALTGR 1
+#define KG_SHIFTL 4
+#define KG_SHIFTR 5
+#define KG_CTRLL 6
+#define KG_CTRLR 7
+
+#define KT_LATIN 0
+#define KT_LETTER 11
+#define KT_FN 1
+#define KT_SPEC 2
+#define KT_META 8
+
+#define K(t,v) (((t)8)|(v))
+#define KTYP(x) ((x) 8)
+#define KVAL(x) ((x) 0xff)
+
+#define K_HOLE K(KT_SPEC,0)
Index: ksyms.c
===
--- ksyms.c (revision 29266)
+++ ksyms.c (working copy)
@@ -1,5 +1,4 @@
#include config.h
-#include linux/keyboard.h
#include linux/kd.h
#include stdio.h
#include string.h
@@ -7,6 +6,7 @@
#include ksyms.h
#include getfd.h
#include nls.h
+#include keyboard.h
/* Keysyms whose KTYP is KT_LATIN or KT_LETTER and whose KVAL is 0..127. */
Index: loadkeys.y
===
--- loadkeys.y (revision 29266)
+++ loadkeys.y (working copy)
@@ -18,7 +18,6 @@
#include string.h
#include fcntl.h
#include linux/kd.h
-#include linux/keyboard.h
#include sys/ioctl.h
#include ctype.h
#include debian-installer.h
@@ -28,6 +27,7 @@
#include findfile.h
#include modifiers.h
#include nls.h
+#include keyboard.h
#ifndef KT_LETTER
#define KT_LETTER KT_LATIN
signature.asc
Description: Digital signature