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

Switch to libbsd-overlay 

This is more portable than libbsd as everything Just Works, even on BSD systems,
and is the recommended method of consuming libbsd nowadays.

It also helpfully lets things work with glibc-provided functions for new
enough glibc.

Closes: https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/973
Co-authored-by: Guillem Jover <guillem@hadrons.org>
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Sam James 2023-08-02 12:33:19 +01:00 committed by Matt Turner
parent 8128a21554
commit 94945a5274
3 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/os.h
View File

@ -50,16 +50,13 @@ SOFTWARE.
#include "misc.h" #include "misc.h"
#include <stdarg.h> #include <stdarg.h>
#include <stdint.h> #include <stdint.h>
#if defined(HAVE_REALLOCARRAY)
#include <stdlib.h> /* for reallocarray */
#endif
#include <string.h> #include <string.h>
#ifdef MONOTONIC_CLOCK #ifdef MONOTONIC_CLOCK
#include <time.h> #include <time.h>
#endif #endif
#if defined(HAVE_LIBBSD) && defined(HAVE_REALLOCARRAY)
#include <bsd/stdlib.h> /* for reallocarray */
#endif
#if defined(HAVE_LIBBSD) && defined(HAVE_STRLCPY)
#include <bsd/string.h> /* for strlcpy, strlcat */
#endif
#define SCREEN_SAVER_ON 0 #define SCREEN_SAVER_ON 0
#define SCREEN_SAVER_OFF 1 #define SCREEN_SAVER_OFF 1

2
meson.build
View File

@ -98,7 +98,7 @@ xshmfence_dep = dependency('xshmfence', version: '>= 1.1', required: false)
xwaylandproto_dep = dependency('xwaylandproto', version: '>= 1.0', fallback: ['xorgproto', 'ext_xorgproto'], required: false) xwaylandproto_dep = dependency('xwaylandproto', version: '>= 1.0', fallback: ['xorgproto', 'ext_xorgproto'], required: false)
pixman_dep = dependency('pixman-1') pixman_dep = dependency('pixman-1')
libbsd_dep = dependency('libbsd', required: false) libbsd_dep = dependency('libbsd-overlay', required: false)
xkbcomp_dep = dependency('xkbcomp', required: false) xkbcomp_dep = dependency('xkbcomp', required: false)
xkbfile_dep = dependency('xkbfile') xkbfile_dep = dependency('xkbfile')
xfont2_dep = dependency('xfont2', version: '>= 2.0') xfont2_dep = dependency('xfont2', version: '>= 2.0')

4
os/auth.c
View File

@ -46,9 +46,7 @@ from The Open Group.
#ifdef WIN32 #ifdef WIN32
#include <X11/Xw32defs.h> #include <X11/Xw32defs.h>
#endif #endif
#ifdef HAVE_LIBBSD #include <stdlib.h> /* for arc4random_buf() */
#include <bsd/stdlib.h> /* for arc4random_buf() */
#endif
struct protocol { struct protocol {
unsigned short name_length; unsigned short name_length;