Sun Jul 19 19:11:05 2020 UTC ()
Sync with xorg-server.old: Remove #ifdef XKB conditional.

> It has been mandatory on Xorg:
>  https://cgit.freedesktop.org/xorg/xserver/commit/?id=40877c6680863bd6a8475f2bb0c54df55bcf0b0e


(tsutsui)
diff -r1.5 -r1.6 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c
cvs diff -r1.5 -r1.6 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c (expand / switch to unified diff)

--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c 2020/07/18 15:37:02 1.5
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c 2020/07/19 19:11:05 1.6
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: x68kKbd.c,v 1.5 2020/07/18 15:37:02 tsutsui Exp $ */ 1/* $NetBSD: x68kKbd.c,v 1.6 2020/07/19 19:11:05 tsutsui Exp $ */
2/*------------------------------------------------------------------------- 2/*-------------------------------------------------------------------------
3 * Copyright (c) 1996 Yasushi Yamasaki 3 * Copyright (c) 1996 Yasushi Yamasaki
4 * All rights reserved. 4 * All rights reserved.
5 * 5 *
6 * Redistribution and use in source and binary forms, with or without 6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions 7 * modification, are permitted provided that the following conditions
8 * are met: 8 * are met:
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
11 * 2. Redistributions in binary form must reproduce the above copyright 11 * 2. Redistributions in binary form must reproduce the above copyright
12 * notice, this list of conditions and the following disclaimer in the 12 * notice, this list of conditions and the following disclaimer in the
13 * documentation and/or other materials provided with the distribution. 13 * documentation and/or other materials provided with the distribution.
14 * 14 *
@@ -372,32 +372,30 @@ DDXRingBell(int volume, int pitch, int d @@ -372,32 +372,30 @@ DDXRingBell(int volume, int pitch, int d
372#define XKB_LED_ZENKAKU 0x40 372#define XKB_LED_ZENKAKU 0x40
373#define XKB_LED_HIRAGANA 0x20 373#define XKB_LED_HIRAGANA 0x20
374#define XKB_LED_INSERT 0x10 374#define XKB_LED_INSERT 0x10
375#define XKB_LED_CAPS_LOCK 0x08 375#define XKB_LED_CAPS_LOCK 0x08
376#define XKB_LED_CODE_INPUT 0x04 376#define XKB_LED_CODE_INPUT 0x04
377#define XKB_LED_ROMAJI 0x02 377#define XKB_LED_ROMAJI 0x02
378#define XKB_LED_KANA_LOCK 0x01 378#define XKB_LED_KANA_LOCK 0x01
379 379
380static void 380static void
381x68kKbdCtrl(DeviceIntPtr pDev, KeybdCtrl *ctrl) 381x68kKbdCtrl(DeviceIntPtr pDev, KeybdCtrl *ctrl)
382{ 382{
383 X68kKbdPrivPtr pPriv = (X68kKbdPrivPtr)pDev->public.devicePrivate; 383 X68kKbdPrivPtr pPriv = (X68kKbdPrivPtr)pDev->public.devicePrivate;
384 384
385#ifdef XKB 
386 if (pPriv->leds != ctrl->leds) { 385 if (pPriv->leds != ctrl->leds) {
387 x68kSetLeds(pPriv, (u_char)ctrl->leds); 386 x68kSetLeds(pPriv, (u_char)ctrl->leds);
388 pPriv->leds = ctrl->leds; 387 pPriv->leds = ctrl->leds;
389 } 388 }
390#endif 
391} 389}
392 390
393/*------------------------------------------------------------------------- 391/*-------------------------------------------------------------------------
394 * function "x68kSetLeds" 392 * function "x68kSetLeds"
395 * 393 *
396 * purpose: set keyboard leds to specified state 394 * purpose: set keyboard leds to specified state
397 * argument: (X68kKbdPrivPtr)pPriv 395 * argument: (X68kKbdPrivPtr)pPriv
398 * (u_char)data; 396 * (u_char)data;
399 * returns: nothing 397 * returns: nothing
400 *-----------------------------------------------------------------------*/ 398 *-----------------------------------------------------------------------*/
401static void 399static void
402x68kSetLeds(X68kKbdPrivPtr pPriv, u_char data) 400x68kSetLeds(X68kKbdPrivPtr pPriv, u_char data)
403{ 401{