diff options
| author | Sam James <sam@gentoo.org> | 2023-08-02 12:33:19 +0100 |
|---|---|---|
| committer | Matt Turner <mattst88@gmail.com> | 2023-08-16 19:56:50 +0000 |
| commit | 94945a52746ee2612c6cd394692f49e2ed5fc56b (patch) | |
| tree | 32375f2092b98844212df584568a345be440cd71 /include | |
| parent | 8128a21554788b3eda49d28bb8f5eba064dafeaf (diff) | |
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>
Diffstat (limited to 'include')
| -rw-r--r-- | include/os.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/include/os.h b/include/os.h index bb3348b18..7db24088f 100644 --- a/include/os.h +++ b/include/os.h @@ -50,16 +50,13 @@ SOFTWARE. #include "misc.h" #include <stdarg.h> #include <stdint.h> +#if defined(HAVE_REALLOCARRAY) +#include <stdlib.h> /* for reallocarray */ +#endif #include <string.h> #ifdef MONOTONIC_CLOCK #include <time.h> #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_OFF 1 |