xserver: Branch 'master'

[GitLab Mirror]

 include/meson.build |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit a1b5aa5a7f12adc43720a5ae11e6cef42b78df83
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Wed Oct 30 10:34:14 2024 -0700

    dix-config.h: add HAVE_SOCKLEN_T definition
    
    Needed to build with IPv6 disabled using gcc 14 on some platforms to avoid:
    
    In file included from /usr/X11/include/X11/Xtrans/transport.c:67,
                     from xstrans.c:17:
    /usr/X11/include/X11/Xtrans/Xtranssock.c: In function ‘_XSERVTransSocketOpen’:
    /usr/X11/include/X11/Xtrans/Xtranssock.c:467:28: error: passing argument 5
     of ‘getsockopt’ from incompatible pointer type [-Wincompatible-pointer-types]
      467 |             (char *) &val, &len) == 0 && val < 64 * 1024)
          |                            ^~~~
          |                            |
          |                            size_t * {aka long unsigned int *}
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1736>

diff --git a/include/meson.build b/include/meson.build
index b6b1c82d6..6d39bf603 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -165,6 +165,8 @@ conf_data.set('HAVE_SETITIMER', cc.has_function('setitimer') ? '1' : false)
 conf_data.set('HAVE_SHMCTL64', cc.has_function('shmctl64') ? '1' : false)
 conf_data.set('HAVE_SIGACTION', cc.has_function('sigaction') ? '1' : false)
 conf_data.set('HAVE_SIGPROCMASK', cc.has_function('sigprocmask') ? '1' : false)
+# HAVE_SOCKLEN_T is used by xtrans when IPv6 is disabled
+conf_data.set('HAVE_SOCKLEN_T', cc.has_type('socklen_t', prefix: '#include <sys/socket.h>') ? '1' : false)
 conf_data.set('HAVE_STRCASECMP', cc.has_function('strcasecmp') ? '1' : false)
 conf_data.set('HAVE_STRCASESTR', cc.has_function('strcasestr') ? '1' : false)
 conf_data.set('HAVE_STRLCAT', cc.has_function('strlcat', dependencies: libbsd_dep) ? '1' : false)