diff options
author | Laurent Carlier <lordheavym@gmail.com> | 2018-02-18 10:58:34 +0100 |
---|---|---|
committer | Adam Jackson <ajax@redhat.com> | 2018-02-19 13:14:43 -0500 |
commit | e790bc621b8f55489e35b1de260c649d8d105d63 (patch) | |
tree | 815b0635092a669c5d23f2c87e5f903949735a96 | |
parent | ce4e20f80ff64a5a8b9f344e2507128f379e0715 (diff) |
dga: #if XFreeXDGA → #ifdef XFreeXDGA
../include/events.h:32:14: error: #if with no expression
Signed-off-by: Laurent Carlier <lordheavym@gmail.com>
-rw-r--r-- | hw/xfree86/common/xf86Xinput.c | 6 | ||||
-rw-r--r-- | include/events.h | 2 | ||||
-rw-r--r-- | include/eventstr.h | 4 | ||||
-rw-r--r-- | mi/mieq.c | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c index 136bf50ff..75235b368 100644 --- a/hw/xfree86/common/xf86Xinput.c +++ b/hw/xfree86/common/xf86Xinput.c @@ -1181,7 +1181,7 @@ xf86CheckMotionEvent4DGA(DeviceIntPtr device, int is_absolute, { int stolen = 0; -#if XFreeXDGA +#ifdef XFreeXDGA ScreenPtr scr = NULL; int idx = 0, i; @@ -1375,7 +1375,7 @@ xf86PostButtonEventM(DeviceIntPtr device, flags = POINTER_RELATIVE | POINTER_ACCELERATE; } -#if XFreeXDGA +#ifdef XFreeXDGA if (miPointerGetScreen(device)) { int index = miPointerGetScreen(device)->myNum; @@ -1406,7 +1406,7 @@ xf86PostKeyEventP(DeviceIntPtr device, void xf86PostKeyEventM(DeviceIntPtr device, unsigned int key_code, int is_down) { -#if XFreeXDGA +#ifdef XFreeXDGA DeviceIntPtr pointer; /* Some pointers send key events, paired device is wrong then. */ diff --git a/include/events.h b/include/events.h index c0ef45d5f..0cbd8c84a 100644 --- a/include/events.h +++ b/include/events.h @@ -29,7 +29,7 @@ typedef struct _DeviceChangedEvent DeviceChangedEvent; typedef struct _TouchOwnershipEvent TouchOwnershipEvent; typedef struct _BarrierEvent BarrierEvent; -#if XFreeXDGA +#ifdef XFreeXDGA typedef struct _DGAEvent DGAEvent; #endif typedef struct _RawDeviceEvent RawDeviceEvent; diff --git a/include/eventstr.h b/include/eventstr.h index 74469613a..bf3b95fe4 100644 --- a/include/eventstr.h +++ b/include/eventstr.h @@ -200,7 +200,7 @@ struct _DeviceChangedEvent { } keys; }; -#if XFreeXDGA +#ifdef XFreeXDGA /** * DGAEvent, used by DGA to intercept and emulate input events. */ @@ -287,7 +287,7 @@ union _InternalEvent { DeviceChangedEvent changed_event; TouchOwnershipEvent touch_ownership_event; BarrierEvent barrier_event; -#if XFreeXDGA +#ifdef XFreeXDGA DGAEvent dga_event; #endif RawDeviceEvent raw_event; @@ -320,7 +320,7 @@ ChangeDeviceID(DeviceIntPtr dev, InternalEvent *event) case ET_TouchOwnership: event->touch_ownership_event.deviceid = dev->id; break; -#if XFreeXDGA +#ifdef XFreeXDGA case ET_DGAEvent: break; #endif @@ -385,7 +385,7 @@ CopyGetMasterEvent(DeviceIntPtr sdev, if (!sdev || IsMaster(sdev) || IsFloating(sdev)) return NULL; -#if XFreeXDGA +#ifdef XFreeXDGA if (type == ET_DGAEvent) type = original->dga_event.subtype; #endif |