summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2009-07-15 12:30:02 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2009-07-15 12:30:44 +1000
commit693babbf12cc7969c3e211c4037c7af0d41c13e9 (patch)
tree601dc718cbd2db3bfdebe642adfab07ba13738ba
parent35ff5cd26eb7564fefebf238e30b8d43cbb4dc25 (diff)
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@who-t.net>
-rw-r--r--include/xkbsrv.h1
-rw-r--r--xkb/xkb.c1
-rw-r--r--xkb/xkbfmisc.c1
-rw-r--r--xkb/xkbout.c1
-rw-r--r--xkb/xkbtext.c1
-rw-r--r--xkb/xkmread.c1
6 files changed, 5 insertions, 1 deletions
diff --git a/include/xkbsrv.h b/include/xkbsrv.h
index 48891fd99..1c4378ab5 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 c17250a37..b0d92b798 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 aa660dfbe..52ef6362c 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 8913d8ed2..b1c30d052 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 2f5819985..95ad01378 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 3e0567928..6623d1bf0 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"