xserver: Branch 'master'

[Peter Hutterer]

 include/xkbsrv.h |    1 -
 xkb/xkb.c        |    1 +
 xkb/xkbfmisc.c   |    1 +
 xkb/xkbout.c     |    1 +
 xkb/xkbtext.c    |    1 +
 xkb/xkmread.c    |    1 +
 6 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 693babbf12cc7969c3e211c4037c7af0d41c13e9
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Wed Jul 15 12:30:02 2009 +1000

    xkb: Remove XKMformat.h include from xkbsrv.h into the files that need it.
    
    xkbsrv.h is used by drivers, they don't need the XKM format and shouldn't
    require it.
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/include/xkbsrv.h b/include/xkbsrv.h
index 48891fd..1c4378a 100644
--- a/include/xkbsrv.h
+++ b/include/xkbsrv.h
@@ -947,7 +947,6 @@ extern int XkbGetKeysym(
         DeviceEvent*            /* event*/);
 
 #include "xkbfile.h"
-#include <X11/extensions/XKMformat.h>
 #include "xkbrules.h"
 
 #define	_XkbListKeycodes	0
diff --git a/xkb/xkb.c b/xkb/xkb.c
index c17250a..b0d92b7 100644
--- a/xkb/xkb.c
+++ b/xkb/xkb.c
@@ -40,6 +40,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "xkb.h"
 
 #include <X11/extensions/XI.h>
+#include <X11/extensions/XKMformat.h>
 
 int		XkbEventBase;
 static	int	XkbErrorBase;
diff --git a/xkb/xkbfmisc.c b/xkb/xkbfmisc.c
index aa660df..52ef636 100644
--- a/xkb/xkbfmisc.c
+++ b/xkb/xkbfmisc.c
@@ -34,6 +34,7 @@
 
 #include <X11/Xos.h>
 #include <X11/Xfuncs.h>
+#include <X11/extensions/XKMformat.h>
 
 #include <X11/X.h>
 #include <X11/keysym.h>
diff --git a/xkb/xkbout.c b/xkb/xkbout.c
index 8913d8e..b1c30d0 100644
--- a/xkb/xkbout.c
+++ b/xkb/xkbout.c
@@ -36,6 +36,7 @@
 #include <X11/X.h>
 #include <X11/keysym.h>
 #include <X11/Xproto.h>
+#include <X11/extensions/XKMformat.h>
 #include "misc.h"
 #include "inputstr.h"
 #include "dix.h"
diff --git a/xkb/xkbtext.c b/xkb/xkbtext.c
index 2f58199..95ad013 100644
--- a/xkb/xkbtext.c
+++ b/xkb/xkbtext.c
@@ -36,6 +36,7 @@
 
 #include <X11/X.h>
 #include <X11/Xproto.h>
+#include <X11/extensions/XKMformat.h>
 #include "misc.h"
 #include "inputstr.h"
 #include "dix.h"
diff --git a/xkb/xkmread.c b/xkb/xkmread.c
index 3e05679..6623d1b 100644
--- a/xkb/xkmread.c
+++ b/xkb/xkmread.c
@@ -36,6 +36,7 @@
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include <X11/keysym.h>
+#include <X11/extensions/XKMformat.h>
 #include "misc.h"
 #include "inputstr.h"
 #include "xkbstr.h"