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

dtrace: s/#if/#ifdef/ for XSERVER_DTRACE 

No functional change, matches meson style.
This commit is contained in:
Adam Jackson 2019-08-27 15:50:23 -04:00
parent 7968d10fad
commit e0e051a392
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dix/getevents.c
View File

@ -1071,7 +1071,7 @@ GetKeyboardEvents(InternalEvent *events, DeviceIntPtr pDev, int type,
RawDeviceEvent *raw; RawDeviceEvent *raw;
enum DeviceEventSource source_type = EVENT_SOURCE_NORMAL; enum DeviceEventSource source_type = EVENT_SOURCE_NORMAL;
#if XSERVER_DTRACE #ifdef XSERVER_DTRACE
if (XSERVER_INPUT_EVENT_ENABLED()) { if (XSERVER_INPUT_EVENT_ENABLED()) {
XSERVER_INPUT_EVENT(pDev->id, type, key_code, 0, 0, XSERVER_INPUT_EVENT(pDev->id, type, key_code, 0, 0,
NULL, NULL); NULL, NULL);
@ -1615,7 +1615,7 @@ GetPointerEvents(InternalEvent *events, DeviceIntPtr pDev, int type,
int i; int i;
int realtype = type; int realtype = type;
#if XSERVER_DTRACE #ifdef XSERVER_DTRACE
if (XSERVER_INPUT_EVENT_ENABLED()) { if (XSERVER_INPUT_EVENT_ENABLED()) {
XSERVER_INPUT_EVENT(pDev->id, type, buttons, flags, XSERVER_INPUT_EVENT(pDev->id, type, buttons, flags,
mask_in ? mask_in->last_bit + 1 : 0, mask_in ? mask_in->last_bit + 1 : 0,
@ -1755,7 +1755,7 @@ GetProximityEvents(InternalEvent *events, DeviceIntPtr pDev, int type,
DeviceEvent *event; DeviceEvent *event;
ValuatorMask mask; ValuatorMask mask;
#if XSERVER_DTRACE #ifdef XSERVER_DTRACE
if (XSERVER_INPUT_EVENT_ENABLED()) { if (XSERVER_INPUT_EVENT_ENABLED()) {
XSERVER_INPUT_EVENT(pDev->id, type, 0, 0, XSERVER_INPUT_EVENT(pDev->id, type, 0, 0,
mask_in ? mask_in->last_bit + 1 : 0, mask_in ? mask_in->last_bit + 1 : 0,
@ -1885,7 +1885,7 @@ GetTouchEvents(InternalEvent *events, DeviceIntPtr dev, uint32_t ddx_touchid,
Bool emulate_pointer = FALSE; Bool emulate_pointer = FALSE;
int client_id = 0; int client_id = 0;
#if XSERVER_DTRACE #ifdef XSERVER_DTRACE
if (XSERVER_INPUT_EVENT_ENABLED()) { if (XSERVER_INPUT_EVENT_ENABLED()) {
XSERVER_INPUT_EVENT(dev->id, type, ddx_touchid, flags, XSERVER_INPUT_EVENT(dev->id, type, ddx_touchid, flags,
mask_in ? mask_in->last_bit + 1 : 0, mask_in ? mask_in->last_bit + 1 : 0,

2
include/probes.h
View File

@ -30,7 +30,7 @@
/* definitions needed to include Dtrace probes in a source file */ /* definitions needed to include Dtrace probes in a source file */
#if XSERVER_DTRACE #ifdef XSERVER_DTRACE
#include <sys/types.h> #include <sys/types.h>
typedef const char *string; typedef const char *string;
typedef const uint8_t *const_uint8_p; typedef const uint8_t *const_uint8_p;