diff options
| author | Ulrich Sibiller <uli42@gmx.de> | 2019-06-21 10:41:36 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-06-22 11:30:54 +0200 |
| commit | 4962c5a8dee7bc2b903b9aafa27f4d0fd3c1d177 (patch) | |
| tree | 4947d6dbb0a62f8a4802c4aaa4712db7ec6577dd /nx-X11/programs/Xserver/xkb/xkbInit.c | |
| parent | 56dcc8a4b6a9ed3b7f55e0eeaeff9bc14737cdd5 (diff) | |
| download | nx-libs-4962c5a8dee7bc2b903b9aafa27f4d0fd3c1d177.tar.gz nx-libs-4962c5a8dee7bc2b903b9aafa27f4d0fd3c1d177.tar.bz2 nx-libs-4962c5a8dee7bc2b903b9aafa27f4d0fd3c1d177.zip | |
XKB: Remove a bunch of mad ifdefs
commit 534fc5140b039a8c98ab715d0a6740d513b41209
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Feb 3 23:30:22 2008 +1100
XKB: Remove a bunch of mad ifdefs
We have SEEK_SET and size_t, seriously. Also use DebugF instead of
ifdef DEBUG, and ditch a couple of random bits that were never used.
Diffstat (limited to 'nx-X11/programs/Xserver/xkb/xkbInit.c')
| -rw-r--r-- | nx-X11/programs/Xserver/xkb/xkbInit.c | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/nx-X11/programs/Xserver/xkb/xkbInit.c b/nx-X11/programs/Xserver/xkb/xkbInit.c index 2f7fa475d..f37e202d8 100644 --- a/nx-X11/programs/Xserver/xkb/xkbInit.c +++ b/nx-X11/programs/Xserver/xkb/xkbInit.c @@ -284,10 +284,6 @@ XkbSetRulesDflts(char *rulesFile,char *model,char *layout, /***====================================================================***/ -#if defined(luna) -#define XKB_DDX_PERMANENT_LOCK 1 -#endif - #include "xkbDflts.h" static Bool @@ -394,15 +390,6 @@ Atom unknown; names->indicators[LED_COMPOSE-1] = CREATE_ATOM("Compose"); #endif } -#ifdef DEBUG_RADIO_GROUPS - if (names->num_rg<1) { - names->radio_groups= (Atom *)_XkbCalloc(RG_COUNT, sizeof(Atom)); - if (names->radio_groups) { - names->num_rg = RG_COUNT; - names->radio_groups[RG_BOGUS_FUNCTION_GROUP]= CREATE_ATOM("BOGUS"); - } - } -#endif if (xkb->geom!=NULL) names->geometry= xkb->geom->name; else names->geometry= unknown; @@ -773,9 +760,7 @@ XkbSrvLedInfoPtr sli; sli= XkbFindSrvLedInfo(pXDev,XkbDfltXIClass,XkbDfltXIId,0); if (sli && xkbi) XkbCheckIndicatorMaps(xkbi->device,sli,XkbAllIndicatorsMask); -#ifdef DEBUG - else ErrorF("No indicator feedback in XkbFinishInit (shouldn't happen)!\n"); -#endif + else DebugF("No indicator feedback in XkbFinishInit (shouldn't happen)!\n"); return softRepeat; } |