diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2024-10-30 10:34:14 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2024-10-30 17:12:06 -0700 |
| commit | 1a836cd47be8177cb3ab3ac2bc90e926c24c0cac (patch) | |
| tree | 3edf60b26cdbc13042146f29def94e74ca4d18b4 | |
| parent | 18c9cd6ab799cf8bd7fb90b4965455bece0046c3 (diff) | |
dix-config.h: add HAVE_SOCKLEN_T definitionserver-21.1-branch
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 *}
(Backport to xserver-21.1-branch of commit a1b5aa5a7f12adc43720a5ae11e6c.
Backport adds autoconf equivalent to meson change from master branch.)
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1737>
| -rw-r--r-- | include/dix-config.h.in | 3 | ||||
| -rw-r--r-- | include/meson.build | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/include/dix-config.h.in b/include/dix-config.h.in index 382d70609..d8ba80c5f 100644 --- a/include/dix-config.h.in +++ b/include/dix-config.h.in @@ -173,6 +173,9 @@ /* Define to 1 if you have the `shmctl64' function. */ #undef HAVE_SHMCTL64 +/* Define to 1 if the system has the type 'socklen_t'. */ +#undef HAVE_SOCKLEN_T + /* Define to 1 if you have the <stdlib.h> header file. */ #undef HAVE_STDLIB_H diff --git a/include/meson.build b/include/meson.build index 591bc25e0..dc785a38e 100644 --- a/include/meson.build +++ b/include/meson.build @@ -166,6 +166,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) |