xserver: Branch 'server-1.3-branch'

[Dodji Seketeli]

 hw/kdrive/ephyr/hostx.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
diff-tree dcc3de91d2b80be98e4488df29ec6b551c7ff6d1 (from 1d7fbdfea4f4dbbbb685c7407a1c060ac3875874)
Author: Alan Coopersmith <alan.coopersmith at sun.com>
Date:   Sat Aug 18 11:50:33 2007 +0200

    Xephyr: fix immediat segfault on amd64
    
    This closes bug https://bugs.freedesktop.org/show_bug.cgi?id=11582

diff --git a/hw/kdrive/ephyr/hostx.c b/hw/kdrive/ephyr/hostx.c
index d0a2f2f..12118da 100644
--- a/hw/kdrive/ephyr/hostx.c
+++ b/hw/kdrive/ephyr/hostx.c
@@ -40,6 +40,7 @@
 #include <X11/Xatom.h>
 #include <X11/keysym.h>
 #include <X11/extensions/XShm.h>
+#include <X11/Xmd.h>
 
 /*  
  * All xlib calls go here, which gets built as its own .a .
@@ -79,7 +80,7 @@ static int            HostXWantDamageDeb
 
 extern KeySym         EphyrKeymap[];
 
-extern KeySym	      kdKeymap[];
+extern CARD32	      kdKeymap[];
 extern int	      kdMinScanCode;
 extern int	      kdMaxScanCode;
 extern int	      kdMinKeyCode;