xserver: Branch 'master'

[GitLab Mirror]

 include/meson.build |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit eceafd4a2d159f5c2b789ad77ee283c2aa848a59
Author: Jan Beich <jbeich at FreeBSD.org>
Date:   Fri Apr 9 14:44:13 2021 +0000

    meson: switch getpeer* checks to autotools style
    
    Checking for function "getpeereid" : YES
    Checking for function "getpeerucred" : NO
    [...]
    include/meson.build:182:7: ERROR: Argument to "not" is not a boolean.
    
    Fixes: 68c2cfadd6d3 ("meson: Make sure defines are either set to 1 or not defined")

diff --git a/include/meson.build b/include/meson.build
index d9ab76941..23dc254ee 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -181,7 +181,7 @@ if cc.has_header_symbol('sys/socket.h', 'SCM_RIGHTS')
   conf_data.set('XTRANS_SEND_FDS', '1')
 endif
 
-if not conf_data.get('HAVE_GETPEEREID') and not conf_data.get('HAVE_GETPEERUCRED')
+if conf_data.get('HAVE_GETPEEREID') == false and conf_data.get('HAVE_GETPEERUCRED') == false
     if not cc.has_header_symbol('sys/socket.h', 'SO_PEERCRED')
         conf_data.set('NO_LOCAL_CLIENT_CRED', 1)
     endif