diff options
| author | Enrico Weigelt, metux IT consult <info@metux.net> | 2024-04-16 16:43:28 +0200 |
|---|---|---|
| committer | Marge Bot <emma+marge@anholt.net> | 2024-07-26 22:26:07 +0000 |
| commit | 69b57fd01f8427268b4ab44f2ca70388407de0bf (patch) | |
| tree | ab3950b751630c10cbd26712d0d5ff682c7adcc0 | |
| parent | ab701418b2c00d30905ce692f1919167d8febe25 (diff) | |
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>
| -rw-r--r-- | include/meson.build | 1 | ||||
| -rw-r--r-- | os/utils.c | 4 |
2 files changed, 1 insertions, 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) |