From e0e051a3920e3e2731d35807e00d30ba9ef7f122 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Tue, 27 Aug 2019 15:50:23 -0400
Subject: [PATCH] dtrace: s/#if/#ifdef/ for XSERVER_DTRACE

No functional change, matches meson style.
---
 dix/getevents.c  | 8 ++++----
 include/probes.h | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dix/getevents.c b/dix/getevents.c
index f83dac709..f784c68d5 100644
--- a/dix/getevents.c
+++ b/dix/getevents.c
@@ -1071,7 +1071,7 @@ GetKeyboardEvents(InternalEvent *events, DeviceIntPtr pDev, int type,
     RawDeviceEvent *raw;
     enum DeviceEventSource source_type = EVENT_SOURCE_NORMAL;
 
-#if XSERVER_DTRACE
+#ifdef XSERVER_DTRACE
     if (XSERVER_INPUT_EVENT_ENABLED()) {
         XSERVER_INPUT_EVENT(pDev->id, type, key_code, 0, 0,
                             NULL, NULL);
@@ -1615,7 +1615,7 @@ GetPointerEvents(InternalEvent *events, DeviceIntPtr pDev, int type,
     int i;
     int realtype = type;
 
-#if XSERVER_DTRACE
+#ifdef XSERVER_DTRACE
     if (XSERVER_INPUT_EVENT_ENABLED()) {
         XSERVER_INPUT_EVENT(pDev->id, type, buttons, flags,
                             mask_in ? mask_in->last_bit + 1 : 0,
@@ -1755,7 +1755,7 @@ GetProximityEvents(InternalEvent *events, DeviceIntPtr pDev, int type,
     DeviceEvent *event;
     ValuatorMask mask;
 
-#if XSERVER_DTRACE
+#ifdef XSERVER_DTRACE
     if (XSERVER_INPUT_EVENT_ENABLED()) {
         XSERVER_INPUT_EVENT(pDev->id, type, 0, 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;
     int client_id = 0;
 
-#if XSERVER_DTRACE
+#ifdef XSERVER_DTRACE
     if (XSERVER_INPUT_EVENT_ENABLED()) {
         XSERVER_INPUT_EVENT(dev->id, type, ddx_touchid, flags,
                             mask_in ? mask_in->last_bit + 1 : 0,
diff --git a/include/probes.h b/include/probes.h
index 879bddfe5..f2ed40fe3 100644
--- a/include/probes.h
+++ b/include/probes.h
@@ -30,7 +30,7 @@
 
 /* definitions needed to include Dtrace probes in a source file */
 
-#if XSERVER_DTRACE
+#ifdef XSERVER_DTRACE
 #include <sys/types.h>
 typedef const char *string;
 typedef const uint8_t *const_uint8_p;