From 69b57fd01f8427268b4ab44f2ca70388407de0bf Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Tue, 16 Apr 2024 16:43:28 +0200
Subject: [PATCH] os: move defining LOCK_SERVER into meson

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1320>
---
 include/meson.build | 1 +
 os/utils.c          | 4 ----
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/include/meson.build b/include/meson.build
index 9f84f2b95..77c761862 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -176,6 +176,7 @@ conf_data.set('HAVE_VASPRINTF', cc.has_function('vasprintf') ? '1' : false)
 conf_data.set('HAVE_VSNPRINTF', cc.has_function('vsnprintf') ? '1' : false)
 conf_data.set('HAVE_WALKCONTEXT', cc.has_function('walkcontext') ? '1' : false)
 conf_data.set('HAVE_XUCRED_CR_PID', cc.has_member('struct xucred', 'cr_pid', prefix : '#include <sys/ucred.h>') ? '1' : false)
+conf_data.set('LOCK_SERVER', host_machine.system() != 'windows' ? '1' : false)
 
 # Don't let X dependencies typedef 'pointer'
 conf_data.set('_XTYPEDEF_POINTER', '1')
diff --git a/os/utils.c b/os/utils.c
index 802b01090..c29c085a3 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -234,10 +234,6 @@ OsSignal(int sig, OsSigHandlerPtr handler)
 #define LOCK_PREFIX "/.X"
 #define LOCK_SUFFIX "-lock"
 
-#if !defined(WIN32) || defined(__CYGWIN__)
-#define LOCK_SERVER
-#endif
-
 #ifndef LOCK_SERVER
 void
 LockServer(void)