summaryrefslogtreecommitdiff
path: root/xkb
diff options
context:
space:
mode:
authorDaniel Stone <daniel@fooishbar.org>2006-05-29 09:26:32 +0000
committerDaniel Stone <daniel@fooishbar.org>2006-05-29 09:26:32 +0000
commitdb0680cf70b8367e1f8a7fff9c0f6ec414db0542 (patch)
tree687c2134abb727b10528c1510bbb4767154de4bc /xkb
parentc38aab293a06f43c04f14223f94f822d91d73396 (diff)
Minor #include cleanups.
Diffstat (limited to 'xkb')
-rw-r--r--xkb/ddxKillSrv.c7
-rw-r--r--xkb/ddxPrivate.c8
-rw-r--r--xkb/ddxVT.c7
3 files changed, 3 insertions, 19 deletions
diff --git a/xkb/ddxKillSrv.c b/xkb/ddxKillSrv.c
index 740268eb9..3dc31a433 100644
--- a/xkb/ddxKillSrv.c
+++ b/xkb/ddxKillSrv.c
@@ -30,12 +30,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <dix-config.h>
#endif
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
#include <stdio.h>
-#define NEED_EVENTS 1
+#define NEED_EVENTS
#include <X11/X.h>
#include <X11/Xproto.h>
#include <X11/keysym.h>
@@ -43,7 +39,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include "scrnintstr.h"
#include "windowstr.h"
#include <X11/extensions/XKBsrv.h>
-#include <X11/extensions/XI.h>
int
XkbDDXTerminateServer(DeviceIntPtr dev,KeyCode key,XkbAction *act)
diff --git a/xkb/ddxPrivate.c b/xkb/ddxPrivate.c
index f4d3c5db4..22d9d79fe 100644
--- a/xkb/ddxPrivate.c
+++ b/xkb/ddxPrivate.c
@@ -4,15 +4,9 @@
#include <dix-config.h>
#endif
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
-#include <stdio.h>
-#define NEED_EVENTS 1
+#define NEED_EVENTS
#include <X11/X.h>
#include "windowstr.h"
-#define XKBSRV_NEED_FILE_FUNCS
#include <X11/extensions/XKBsrv.h>
int
diff --git a/xkb/ddxVT.c b/xkb/ddxVT.c
index 922b2c65f..ae46850e0 100644
--- a/xkb/ddxVT.c
+++ b/xkb/ddxVT.c
@@ -30,12 +30,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <dix-config.h>
#endif
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
#include <stdio.h>
-#define NEED_EVENTS 1
+#define NEED_EVENTS
#include <X11/X.h>
#include <X11/Xproto.h>
#include <X11/keysym.h>
@@ -43,7 +39,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include "scrnintstr.h"
#include "windowstr.h"
#include <X11/extensions/XKBsrv.h>
-#include <X11/extensions/XI.h>
int
XkbDDXSwitchScreen(DeviceIntPtr dev,KeyCode key,XkbAction *act)