mirror of
https://github.com/X11Libre/xserver.git
synced 2026-10-29 02:31:18 +00:00
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>
This commit is contained in:
parent
f9da417163
commit
40877c6680
38 changed files with 344 additions and 998 deletions
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in a new issue