From 137fea8aa90f1cd6a215644944ba7c91e9658658 Mon Sep 17 00:00:00 2001
From: Alex Richardson <Alexander.Richardson@cl.cam.ac.uk>
Date: Mon, 28 Feb 2022 19:12:30 +0000
Subject: [PATCH] Use #cmakedefine01 for the remaining config macros

Using 0/1 instead of undefined/defined to 1 allows the compiler to flag
a missing include of the config header.
---
 src/config-kwin.h.cmake | 8 ++++----
 src/events.cpp          | 2 +-
 src/main_wayland.cpp    | 2 +-
 src/xwl/xwayland.cpp    | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/config-kwin.h.cmake b/src/config-kwin.h.cmake
index c5aa0d66b6..34413ca48e 100644
--- a/src/config-kwin.h.cmake
+++ b/src/config-kwin.h.cmake
@@ -26,13 +26,13 @@
 #define BREEZE_KDECORATION_PLUGIN_ID "${BREEZE_KDECORATION_PLUGIN_ID}"
 #endif
 
-#cmakedefine XCB_ICCCM_FOUND 1
-#ifndef XCB_ICCCM_FOUND
+#cmakedefine01 XCB_ICCCM_FOUND
+#if !XCB_ICCCM_FOUND
 #define XCB_ICCCM_WM_STATE_WITHDRAWN 0
 #define XCB_ICCCM_WM_STATE_NORMAL 1
 #define XCB_ICCCM_WM_STATE_ICONIC 3
 #endif
 
-#cmakedefine PipeWire_FOUND 1
+#cmakedefine01 PipeWire_FOUND
 
-#cmakedefine HAVE_XWAYLAND_LISTENFD
+#cmakedefine01 HAVE_XWAYLAND_LISTENFD
diff --git a/src/events.cpp b/src/events.cpp
index f5e0439b66..1495fd89cb 100644
--- a/src/events.cpp
+++ b/src/events.cpp
@@ -46,7 +46,7 @@
 
 #include <xcb/damage.h>
 #include <xcb/sync.h>
-#ifdef XCB_ICCCM_FOUND
+#if XCB_ICCCM_FOUND
 #include <xcb/xcb_icccm.h>
 #endif
 
diff --git a/src/main_wayland.cpp b/src/main_wayland.cpp
index 74b4ec416d..6c716fa602 100644
--- a/src/main_wayland.cpp
+++ b/src/main_wayland.cpp
@@ -53,7 +53,7 @@ Q_IMPORT_PLUGIN(KWinIntegrationPlugin)
 Q_IMPORT_PLUGIN(KGlobalAccelImpl)
 Q_IMPORT_PLUGIN(KWindowSystemKWinPlugin)
 Q_IMPORT_PLUGIN(KWinIdleTimePoller)
-#ifdef PipeWire_FOUND
+#if PipeWire_FOUND
 Q_IMPORT_PLUGIN(ScreencastManagerFactory)
 #endif
 
diff --git a/src/xwl/xwayland.cpp b/src/xwl/xwayland.cpp
index b7a7b64230..10e1e68249 100644
--- a/src/xwl/xwayland.cpp
+++ b/src/xwl/xwayland.cpp
@@ -195,7 +195,7 @@ bool Xwayland::startInternal()
         for (int socket : qAsConst(m_listenFds)) {
             int dupSocket = dup(socket);
             fdsToClose << dupSocket;
-            #if defined(HAVE_XWAYLAND_LISTENFD)
+            #if HAVE_XWAYLAND_LISTENFD
                 arguments << QStringLiteral("-listenfd") << QString::number(dupSocket);
             #else
                 arguments << QStringLiteral("-listen") << QString::number(dupSocket);