diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2008-03-18 10:05:57 +0200 |
|---|---|---|
| committer | Daniel Stone <daniel@fooishbar.org> | 2009-01-22 15:06:25 +1100 |
| commit | 40877c6680863bd6a8475f2bb0c54df55bcf0b0e (patch) | |
| tree | 9f958934add153efc9f6e85900fd5ff9ab2320da /hw/dmx/dmxclient.h | |
| parent | f9da417163b6b2d6234d2542c1f375e33db7159a (diff) | |
XKB: Make XKB mandatory
No more #ifdef XKB, because you can't disable the build, and no more
noXkbExtension either.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'hw/dmx/dmxclient.h')
| -rw-r--r-- | hw/dmx/dmxclient.h | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/hw/dmx/dmxclient.h b/hw/dmx/dmxclient.h index f0c3608da..147d14ed8 100644 --- a/hw/dmx/dmxclient.h +++ b/hw/dmx/dmxclient.h @@ -91,10 +91,8 @@ typedef XID KeySym64; #undef PictFormatType #endif -#ifdef XKB #include <X11/extensions/XKB.h> -#include <X11/extensions/XKBstr.h> -#endif +#include "xkbstr.h" #include <X11/extensions/XI.h> @@ -134,14 +132,9 @@ extern int ChangeDeviceNotify; /* Some protocol gets included last, after undefines. */ #include <X11/XKBlib.h> -#ifdef XKB #include <X11/extensions/XKBproto.h> -#ifndef XKB_IN_SERVER -#define XKB_IN_SERVER -#endif -#include <xkbsrv.h> +#include "xkbstr.h" #undef XPointer -#endif #include <X11/extensions/XIproto.h> #endif |