summaryrefslogtreecommitdiff
path: root/hw/xwin/winprocarg.c
diff options
context:
space:
mode:
authorDaniel Stone <daniel@fooishbar.org>2008-03-18 10:05:57 +0200
committerDaniel Stone <daniel@fooishbar.org>2009-01-22 15:06:25 +1100
commit40877c6680863bd6a8475f2bb0c54df55bcf0b0e (patch)
tree9f958934add153efc9f6e85900fd5ff9ab2320da /hw/xwin/winprocarg.c
parentf9da417163b6b2d6234d2542c1f375e33db7159a (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/xwin/winprocarg.c')
-rwxr-xr-xhw/xwin/winprocarg.c11
1 files changed, 0 insertions, 11 deletions
diff --git a/hw/xwin/winprocarg.c b/hw/xwin/winprocarg.c
index f346bed21..38ee9a2df 100755
--- a/hw/xwin/winprocarg.c
+++ b/hw/xwin/winprocarg.c
@@ -1369,16 +1369,6 @@ ddxProcessArgument (int argc, char *argv[], int i)
}
#endif
-#ifdef XKB
- /*
- * Look for the '-kb' argument
- */
- if (IS_OPTION ("-kb"))
- {
- g_cmdline.noXkbExtension = TRUE;
- return 0; /* Let DIX parse this again */
- }
-
if (IS_OPTION ("-xkbrules"))
{
CHECK_ARGS (1);
@@ -1409,7 +1399,6 @@ ddxProcessArgument (int argc, char *argv[], int i)
g_cmdline.xkbOptions = argv[++i];
return 2;
}
-#endif
if (IS_OPTION ("-keyhook"))
{