--- xorg-server-1.2.0/hw/xgl/egl/kkeymap.h.orig	2007-03-26 12:50:20.000000000 -0400
+++ xorg-server-1.2.0/hw/xgl/egl/kkeymap.h	2007-03-26 12:50:37.000000000 -0400
@@ -34,7 +34,7 @@
 #define KD_KEY_OFFSET	(8 - kdMinScanCode)
 
 #define KD_MIN_KEYCODE	8
-#define KD_MAX_KEYCODE	254
+#define KD_MAX_KEYCODE	255
 #define KD_MAX_WIDTH	4
 #define KD_MAX_LENGTH	(KD_MAX_KEYCODE - KD_MIN_KEYCODE + 1)
 
--- xorg-server-1.2.0/hw/kdrive/src/kkeymap.h.orig	2007-03-26 12:50:20.000000000 -0400
+++ xorg-server-1.2.0/hw/kdrive/src/kkeymap.h	2007-03-26 12:50:37.000000000 -0400
@@ -34,7 +34,7 @@
 #define KD_KEY_OFFSET	(8 - kdMinScanCode)
 
 #define KD_MIN_KEYCODE	8
-#define KD_MAX_KEYCODE	254
+#define KD_MAX_KEYCODE	255
 #define KD_MAX_WIDTH	4
 #define KD_MAX_LENGTH	(KD_MAX_KEYCODE - KD_MIN_KEYCODE + 1)
 
--- xorg-server-1.2.0/hw/kdrive/ephyr/hostx.c.orig	2007-03-26 12:50:18.000000000 -0400
+++ xorg-server-1.2.0/hw/kdrive/ephyr/hostx.c	2007-03-26 12:50:37.000000000 -0400
@@ -30,6 +30,7 @@
 #include <unistd.h>
 #include <string.h> 		/* for memset */
 #include <time.h>
+#include <stdint.h>		/* for uint32_t */
 
 #include <sys/ipc.h>
 #include <sys/shm.h>
@@ -78,9 +79,10 @@
 
 static int            HostXWantDamageDebug = 0;
 
-extern KeySym         EphyrKeymap[];
+typedef uint32_t      KeySym32;
+extern KeySym32       EphyrKeymap[];
 
-extern KeySym	      kdKeymap[];
+extern KeySym32	      kdKeymap[];
 extern int	      kdMinScanCode;
 extern int	      kdMaxScanCode;
 extern int	      kdMinKeyCode;