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 /dix/dispatch.c | |
| 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 'dix/dispatch.c')
| -rw-r--r-- | dix/dispatch.c | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/dix/dispatch.c b/dix/dispatch.c index ee105f8dd..09fd3afc6 100644 --- a/dix/dispatch.c +++ b/dix/dispatch.c @@ -136,13 +136,8 @@ int ProcInitialConnection(); #endif #include "privates.h" #include "xace.h" -#ifdef XKB -#ifndef XKB_IN_SERVER -#define XKB_IN_SERVER -#endif #include "inputstr.h" -#include <xkbsrv.h> -#endif +#include "xkbsrv.h" #ifdef XSERVER_DTRACE #include "registry.h" @@ -3478,15 +3473,11 @@ void InitClient(ClientPtr client, int i, pointer ospriv) client->priority = 0; client->clientState = ClientStateInitial; client->devPrivates = NULL; -#ifdef XKB - if (!noXkbExtension) { - client->xkbClientFlags = 0; - client->mapNotifyMask = 0; - client->newKeyboardNotifyMask = 0; - client->vMinor = client->vMajor = 0; - QueryMinMaxKeyCodes(&client->minKC,&client->maxKC); - } -#endif + client->xkbClientFlags = 0; + client->mapNotifyMask = 0; + client->newKeyboardNotifyMask = 0; + client->vMinor = client->vMajor = 0; + QueryMinMaxKeyCodes(&client->minKC,&client->maxKC); client->replyBytesRemaining = 0; client->fontResFunc = NULL; client->smart_priority = 0; |