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 /xkb/xkbInit.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 'xkb/xkbInit.c')
| -rw-r--r-- | xkb/xkbInit.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/xkb/xkbInit.c b/xkb/xkbInit.c index 573e731bd..e800482ac 100644 --- a/xkb/xkbInit.c +++ b/xkb/xkbInit.c @@ -85,9 +85,6 @@ typedef struct _SrvXkmInfo { /***====================================================================***/ -#ifndef XKB_DFLT_DISABLED -#define XKB_DFLT_DISABLED True -#endif #ifndef XKB_DFLT_RULES_PROP #define XKB_DFLT_RULES_PROP True #endif @@ -110,7 +107,6 @@ static char * XkbOptionsUsed= NULL; static XkbDescPtr xkb_cached_map = NULL; -Bool noXkbExtension= XKB_DFLT_DISABLED; static Bool XkbWantRulesProp= XKB_DFLT_RULES_PROP; /***====================================================================***/ @@ -817,15 +813,7 @@ extern unsigned char XkbDfltAccessXOptions; int XkbProcessArguments(int argc,char *argv[],int i) { - if (strcmp(argv[i],"-kb")==0) { - noXkbExtension= True; - return 1; - } - else if (strcmp(argv[i],"+kb")==0) { - noXkbExtension= False; - return 1; - } - else if (strncmp(argv[i], "-xkbdir", 7) == 0) { + if (strncmp(argv[i], "-xkbdir", 7) == 0) { if(++i < argc) { #if !defined(WIN32) && !defined(__CYGWIN__) if (getuid() != geteuid()) { |