summaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorAlan Coopersmith <Alan.Coopersmith@sun.com>2005-11-08 03:12:43 +0000
committerAlan Coopersmith <Alan.Coopersmith@sun.com>2005-11-08 03:12:43 +0000
commitf5814bf3fff5352ed6edef4c58aadf2d4593f094 (patch)
tree35b6088e882ed42f550d45b9a85384a8a56b5551 /hw
parente73cdba865f36ebf78c2dc4ff674b4d9bfe85013 (diff)
Don't reference noXkbExtension when building without XKB. (Bob Terek - Sun
Microsystems)
Diffstat (limited to 'hw')
-rw-r--r--hw/xfree86/common/xf86DGA.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/hw/xfree86/common/xf86DGA.c b/hw/xfree86/common/xf86DGA.c
index 0db4ecd10..d121936c6 100644
--- a/hw/xfree86/common/xf86DGA.c
+++ b/hw/xfree86/common/xf86DGA.c
@@ -1029,7 +1029,11 @@ DGAProcessKeyboardEvent (ScreenPtr pScreen, dgaEvent *de, DeviceIntPtr keybd)
inputInfo.pointer->valuator->motionHintWindow = NullWindow;
*kptr |= bit;
keyc->prev_state = keyc->state;
- if (noXkbExtension) {
+#ifdef XKB
+ if (noXkbExtension)
+#endif
+ {
+
for (i = 0, mask = 1; modifiers; i++, mask <<= 1)
{
if (mask & modifiers)
@@ -1046,7 +1050,10 @@ DGAProcessKeyboardEvent (ScreenPtr pScreen, dgaEvent *de, DeviceIntPtr keybd)
inputInfo.pointer->valuator->motionHintWindow = NullWindow;
*kptr &= ~bit;
keyc->prev_state = keyc->state;
- if (noXkbExtension) {
+#ifdef XKB
+ if (noXkbExtension)
+#endif
+ {
for (i = 0, mask = 1; modifiers; i++, mask <<= 1)
{
if (mask & modifiers) {