From 3d0889d2b8d326319e17ffc49e114892ef54f979 Mon Sep 17 00:00:00 2001
From: Kaleb Keithley <kaleb@freedesktop.org>
Date: Mon, 17 Nov 2003 19:03:41 +0000
Subject: merge XFree86 4.3.0.1 to -CURRENT

---
 src/XGetKMap.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'src/XGetKMap.c')

diff --git a/src/XGetKMap.c b/src/XGetKMap.c
index 8813b8f..3ea7819 100644
--- a/src/XGetKMap.c
+++ b/src/XGetKMap.c
@@ -45,6 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
+/* $XFree86: xc/lib/Xi/XGetKMap.c,v 3.4 2002/10/16 00:37:28 dawes Exp $ */
 
 /***********************************************************************
  *
@@ -52,11 +53,12 @@ SOFTWARE.
  *
  */
 
-#include "XI.h"
-#include "XIproto.h"
-#include "Xlibint.h"
-#include "XInput.h"
-#include "extutil.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
+#include <X11/Xlibint.h>
+#include <X11/extensions/XInput.h>
+#include <X11/extensions/extutil.h>
+#include "XIint.h"
 
 KeySym 
 #if NeedFunctionPrototypes
@@ -83,7 +85,7 @@ KeySym
     register KeySym *mapping = NULL;
     xGetDeviceKeyMappingReq *req;
     xGetDeviceKeyMappingReply rep;
-    XExtDisplayInfo *info = (XExtDisplayInfo *) XInput_find_display (dpy);
+    XExtDisplayInfo *info = XInput_find_display (dpy);
 
     LockDisplay (dpy);
     if (_XiCheckExtInit(dpy, XInput_Initial_Release) == -1)
-- 
cgit v1.2.3