frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-04-16 16:43:28 +02:00 committed by Marge Bot
parent ab701418b2
commit 69b57fd01f
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/meson.build
View File

@ -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_VSNPRINTF', cc.has_function('vsnprintf') ? '1' : false)
conf_data.set('HAVE_WALKCONTEXT', cc.has_function('walkcontext') ? '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('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' # Don't let X dependencies typedef 'pointer'
conf_data.set('_XTYPEDEF_POINTER', '1') conf_data.set('_XTYPEDEF_POINTER', '1')

4
os/utils.c
View File

@ -234,10 +234,6 @@ OsSignal(int sig, OsSigHandlerPtr handler)
#define LOCK_PREFIX "/.X" #define LOCK_PREFIX "/.X"
#define LOCK_SUFFIX "-lock" #define LOCK_SUFFIX "-lock"
#if !defined(WIN32) || defined(__CYGWIN__)
#define LOCK_SERVER
#endif
#ifndef LOCK_SERVER #ifndef LOCK_SERVER
void void
LockServer(void) LockServer(void)