frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dga: #if XFreeXDGA → #ifdef XFreeXDGA 

../include/events.h:32:14: error: #if with no expression

Signed-off-by: Laurent Carlier <lordheavym@gmail.com>
This commit is contained in:
Laurent Carlier 2018-02-18 10:58:34 +01:00 committed by Adam Jackson
parent ce4e20f80f
commit e790bc621b
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/xfree86/common/xf86Xinput.c
View File

@ -1181,7 +1181,7 @@ xf86CheckMotionEvent4DGA(DeviceIntPtr device, int is_absolute,
{ {
int stolen = 0; int stolen = 0;
#if XFreeXDGA #ifdef XFreeXDGA
ScreenPtr scr = NULL; ScreenPtr scr = NULL;
int idx = 0, i; int idx = 0, i;
@ -1375,7 +1375,7 @@ xf86PostButtonEventM(DeviceIntPtr device,
flags = POINTER_RELATIVE | POINTER_ACCELERATE; flags = POINTER_RELATIVE | POINTER_ACCELERATE;
} }
#if XFreeXDGA #ifdef XFreeXDGA
if (miPointerGetScreen(device)) { if (miPointerGetScreen(device)) {
int index = miPointerGetScreen(device)->myNum; int index = miPointerGetScreen(device)->myNum;
@ -1406,7 +1406,7 @@ xf86PostKeyEventP(DeviceIntPtr device,
void void
xf86PostKeyEventM(DeviceIntPtr device, unsigned int key_code, int is_down) xf86PostKeyEventM(DeviceIntPtr device, unsigned int key_code, int is_down)
{ {
#if XFreeXDGA #ifdef XFreeXDGA
DeviceIntPtr pointer; DeviceIntPtr pointer;
/* Some pointers send key events, paired device is wrong then. */ /* Some pointers send key events, paired device is wrong then. */

2
include/events.h
View File

@ -29,7 +29,7 @@ typedef struct _DeviceChangedEvent DeviceChangedEvent;
typedef struct _TouchOwnershipEvent TouchOwnershipEvent; typedef struct _TouchOwnershipEvent TouchOwnershipEvent;
typedef struct _BarrierEvent BarrierEvent; typedef struct _BarrierEvent BarrierEvent;
#if XFreeXDGA #ifdef XFreeXDGA
typedef struct _DGAEvent DGAEvent; typedef struct _DGAEvent DGAEvent;
#endif #endif
typedef struct _RawDeviceEvent RawDeviceEvent; typedef struct _RawDeviceEvent RawDeviceEvent;

4
include/eventstr.h
View File

@ -200,7 +200,7 @@ struct _DeviceChangedEvent {
} keys; } keys;
}; };
#if XFreeXDGA #ifdef XFreeXDGA
/** /**
* DGAEvent, used by DGA to intercept and emulate input events. * DGAEvent, used by DGA to intercept and emulate input events.
*/ */
@ -287,7 +287,7 @@ union _InternalEvent {
DeviceChangedEvent changed_event; DeviceChangedEvent changed_event;
TouchOwnershipEvent touch_ownership_event; TouchOwnershipEvent touch_ownership_event;
BarrierEvent barrier_event; BarrierEvent barrier_event;
#if XFreeXDGA #ifdef XFreeXDGA
DGAEvent dga_event; DGAEvent dga_event;
#endif #endif
RawDeviceEvent raw_event; RawDeviceEvent raw_event;

4
mi/mieq.c
View File

@ -320,7 +320,7 @@ ChangeDeviceID(DeviceIntPtr dev, InternalEvent *event)
case ET_TouchOwnership: case ET_TouchOwnership:
event->touch_ownership_event.deviceid = dev->id; event->touch_ownership_event.deviceid = dev->id;
break; break;
#if XFreeXDGA #ifdef XFreeXDGA
case ET_DGAEvent: case ET_DGAEvent:
break; break;
#endif #endif
@ -385,7 +385,7 @@ CopyGetMasterEvent(DeviceIntPtr sdev,
if (!sdev || IsMaster(sdev) || IsFloating(sdev)) if (!sdev || IsMaster(sdev) || IsFloating(sdev))
return NULL; return NULL;
#if XFreeXDGA #ifdef XFreeXDGA
if (type == ET_DGAEvent) if (type == ET_DGAEvent)
type = original->dga_event.subtype; type = original->dga_event.subtype;
#endif #endif