Fix a compilation error when DEBUG is undefined

Fixes #214 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
linuxwacom · Jan 16, 2022 · 93b7ff5 · 93b7ff5
1 parent dd50f2d
commit 93b7ff5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -51,6 +51,7 @@ jobs:
           - clang
         meson_options:
           - ''
+          - '-Ddebug-messages=false'
           # clang requires b_lundef=false for b_santize, see
           # https://github.com/mesonbuild/meson/issues/764
           - '-Db_sanitize=address,undefined -Db_lundef=false'

diff --git a/src/x11/xf86Wacom.c b/src/x11/xf86Wacom.c
@@ -700,9 +700,7 @@ void wcmClose(WacomDevicePtr priv)
 
 static int wcmReady(WacomDevicePtr priv)
 {
-#ifdef DEBUG
 	InputInfoPtr pInfo = priv->frontend;
-#endif
 	int n = xf86WaitForInput(pInfo->fd, 0);
 	if (n < 0) {
 		int saved_errno = errno;
@@ -842,12 +840,10 @@ static int wcmDevSwitchMode(ClientPtr client, DeviceIntPtr dev, int mode)
 {
 	InputInfoPtr pInfo = (InputInfoPtr)dev->public.devicePrivate;
 	Bool is_absolute = TRUE;
-#ifdef DEBUG
 	WacomDevicePtr priv = (WacomDevicePtr)pInfo->private;
 
-	DBG(3, priv, "dev=%p mode=%d\n",
-		(void *)dev, mode);
-#endif
+	DBG(3, priv, "dev=%p mode=%d\n", (void *)dev, mode);
+
 	if (mode != Absolute) {
 		if (mode != Relative)
 			return XI_BadMode;