diff --git a/lib/libc/include/generic-freebsd/poll.h b/lib/libc/include/generic-freebsd/poll.h index b915f5a37d7efd3ca558e0a3a8d49b31a9a4c601..c3d7f6ff2ab94056d060508ee087b03097af8fd4 100644 --- a/lib/libc/include/generic-freebsd/poll.h +++ b/lib/libc/include/generic-freebsd/poll.h @@ -109,9 +109,12 @@ typedef __sigset_t sigset_t; #endif +// zig patch: ssp/poll.h header was added in FreeBSD 15 +#if __FreeBSD_version >= 1500500 #if defined(_FORTIFY_SOURCE) && _FORTIFY_SOURCE > 0 #include #endif +#endif __BEGIN_DECLS int poll(struct pollfd _pfd[], nfds_t _nfds, int _timeout); diff --git a/lib/libc/include/generic-freebsd/signal.h b/lib/libc/include/generic-freebsd/signal.h index 5f213b97020bcaa93b71624b12d6281458ac44e9..45aaeecf47058904fdd6272eb4f24387383f2bdf 100644 --- a/lib/libc/include/generic-freebsd/signal.h +++ b/lib/libc/include/generic-freebsd/signal.h @@ -72,9 +72,12 @@ typedef __pthread_t pthread_t; #endif #endif /* __POSIX_VISIBLE || __XSI_VISIBLE */ +// zig patch: ssp/signal.h header was added in FreeBSD 15 +#if __FreeBSD_version >= 1500500 #if !defined(_STANDALONE) && defined(_FORTIFY_SOURCE) && _FORTIFY_SOURCE > 0 #include #endif +#endif __BEGIN_DECLS int raise(int); diff --git a/lib/libc/include/generic-freebsd/stdio.h b/lib/libc/include/generic-freebsd/stdio.h index e9119c81f59da504efa6b39fd6c43f8a7a4ac8dd..e1e5eab1de17c6209048f2b3d43b918875ea1bd6 100644 --- a/lib/libc/include/generic-freebsd/stdio.h +++ b/lib/libc/include/generic-freebsd/stdio.h @@ -252,9 +252,12 @@ __END_DECLS #define L_ctermid 1024 /* size for ctermid(3); PATH_MAX */ #endif /* __POSIX_VISIBLE */ +// zig patch: ssp/stdio.h header was added in FreeBSD 15 +#if __FreeBSD_version >= 1500500 #if !defined(_STANDALONE) && defined(_FORTIFY_SOURCE) && _FORTIFY_SOURCE > 0 #include #endif +#endif __BEGIN_DECLS #ifdef _XLOCALE_H_ diff --git a/lib/libc/include/generic-freebsd/stdlib.h b/lib/libc/include/generic-freebsd/stdlib.h index c2522b9d649971c25cdce8f8f9439b03dd27749c..8484d7f7ae5c3d1e603f58bd1798752b718b776b 100644 --- a/lib/libc/include/generic-freebsd/stdlib.h +++ b/lib/libc/include/generic-freebsd/stdlib.h @@ -69,9 +69,12 @@ typedef struct { */ #define RAND_MAX 0x7fffffff +// zig patch: ssp/stdlib.h header was added in FreeBSD 15 +#if __FreeBSD_version >= 1500500 #if !defined(_STANDALONE) && defined(_FORTIFY_SOURCE) && _FORTIFY_SOURCE > 0 #include #endif +#endif __BEGIN_DECLS #ifdef _XLOCALE_H_ diff --git a/lib/libc/include/generic-freebsd/string.h b/lib/libc/include/generic-freebsd/string.h index 48bdd01cf03b4c7435bcc5d5af912f0f58f13beb..a05b91244cfd20af04d48fd80f44228ef902844b 100644 --- a/lib/libc/include/generic-freebsd/string.h +++ b/lib/libc/include/generic-freebsd/string.h @@ -49,9 +49,12 @@ typedef __size_t size_t; #define _SIZE_T_DECLARED #endif +// zig patch: ssp/string.h header was added in FreeBSD 15 +#if __FreeBSD_version >= 1500500 #if !defined(_STANDALONE) && defined(_FORTIFY_SOURCE) && _FORTIFY_SOURCE > 0 #include #endif +#endif __BEGIN_DECLS #if __XSI_VISIBLE >= 600 || __ISO_C_VISIBLE >= 2023 diff --git a/lib/libc/include/generic-freebsd/strings.h b/lib/libc/include/generic-freebsd/strings.h index 38e05ff63704e75f09233f90f63eff3623579b81..72a938133fd01f7c50edc3033a04245a79d59f40 100644 --- a/lib/libc/include/generic-freebsd/strings.h +++ b/lib/libc/include/generic-freebsd/strings.h @@ -37,9 +37,12 @@ typedef __size_t size_t; #define _SIZE_T_DECLARED #endif +// zig patch: ssp/strings.h header was added in FreeBSD 15 +#if __FreeBSD_version >= 1500500 #if !defined(_STANDALONE) && defined(_FORTIFY_SOURCE) && _FORTIFY_SOURCE > 0 #include #endif +#endif __BEGIN_DECLS #if __BSD_VISIBLE || __POSIX_VISIBLE <= 200112 diff --git a/lib/libc/include/generic-freebsd/sys/libkern.h b/lib/libc/include/generic-freebsd/sys/libkern.h index 7a5a44aa5eeb39aa8d67235e2c04fa457bbab525..69875ede7182d6171ea38b91b8946eb84e018934 100644 --- a/lib/libc/include/generic-freebsd/sys/libkern.h +++ b/lib/libc/include/generic-freebsd/sys/libkern.h @@ -334,10 +334,13 @@ signed_extend32(uint32_t bitmap, int lsb, int width) #define FNM_IGNORECASE FNM_CASEFOLD #define FNM_FILE_NAME FNM_PATHNAME +// zig patch: ssp/ssp.h header and __ssp_real were added in FreeBSD 15 +#if __FreeBSD_version >= 1500500 #if !defined(_KERNEL) && __has_include() #include /* __ssp_real */ #else #define __ssp_real(fun) fun #endif +#endif #endif /* !_SYS_LIBKERN_H_ */ \ No newline at end of file diff --git a/lib/libc/include/generic-freebsd/sys/poll.h b/lib/libc/include/generic-freebsd/sys/poll.h index b915f5a37d7efd3ca558e0a3a8d49b31a9a4c601..c3d7f6ff2ab94056d060508ee087b03097af8fd4 100644 --- a/lib/libc/include/generic-freebsd/sys/poll.h +++ b/lib/libc/include/generic-freebsd/sys/poll.h @@ -109,9 +109,12 @@ typedef __sigset_t sigset_t; #endif +// zig patch: ssp/poll.h header was added in FreeBSD 15 +#if __FreeBSD_version >= 1500500 #if defined(_FORTIFY_SOURCE) && _FORTIFY_SOURCE > 0 #include #endif +#endif __BEGIN_DECLS int poll(struct pollfd _pfd[], nfds_t _nfds, int _timeout); diff --git a/lib/libc/include/generic-freebsd/sys/random.h b/lib/libc/include/generic-freebsd/sys/random.h index 7b9af981dfd1cd368900ab809e855486549eb7c9..5c51c9da097c80dee52adb9216c0b20bc65be8ed 100644 --- a/lib/libc/include/generic-freebsd/sys/random.h +++ b/lib/libc/include/generic-freebsd/sys/random.h @@ -156,9 +156,12 @@ random_harvest_direct(const void *entropy, u_int size, enum random_entropy_sourc #else /* !_KERNEL */ +// zig patch: ssp/random.h header was added in FreeBSD 15 +#if __FreeBSD_version >= 1500500 #if defined(_FORTIFY_SOURCE) && _FORTIFY_SOURCE > 0 #include #endif +#endif #endif /* _KERNEL */ diff --git a/lib/libc/include/generic-freebsd/sys/select.h b/lib/libc/include/generic-freebsd/sys/select.h index dd75cacf0af56588ce6bd2eac5e3f374d27158ca..5ac51b5b7a517702a01f049d02beac23bd9be38f 100644 --- a/lib/libc/include/generic-freebsd/sys/select.h +++ b/lib/libc/include/generic-freebsd/sys/select.h @@ -49,11 +49,14 @@ typedef __fd_mask fd_mask; typedef __sigset_t sigset_t; #endif +// zig patch: ssp/ssp.h header and __SSP_FORTIFY_LEVEL were added in FreeBSD 15 +#if __FreeBSD_version >= 1500500 #if !defined(_KERNEL) && defined(_FORTIFY_SOURCE) && _FORTIFY_SOURCE > 0 #include #else #define __SSP_FORTIFY_LEVEL 0 #endif +#endif /* * Select uses bit masks of file descriptors in longs. These macros diff --git a/lib/libc/include/generic-freebsd/sys/socket.h b/lib/libc/include/generic-freebsd/sys/socket.h index aea4284303de80c808e57a0235e92a0c9cbf7a89..f0e5099dd4ca098ba3097d1e08dc0c27900de4c8 100644 --- a/lib/libc/include/generic-freebsd/sys/socket.h +++ b/lib/libc/include/generic-freebsd/sys/socket.h @@ -691,9 +691,12 @@ struct splice { #ifndef _KERNEL +// zig patch: ssp/socket.h header was added in FreeBSD 15 +#if __FreeBSD_version >= 1500500 #if defined(_FORTIFY_SOURCE) && _FORTIFY_SOURCE > 0 #include #endif +#endif #include diff --git a/lib/libc/include/generic-freebsd/sys/uio.h b/lib/libc/include/generic-freebsd/sys/uio.h index 067f9df3c517ba3b3124633d5c5f4d000df14b81..7fbe130e001ecaa9e4c034dc43b6e64d9670c514 100644 --- a/lib/libc/include/generic-freebsd/sys/uio.h +++ b/lib/libc/include/generic-freebsd/sys/uio.h @@ -101,9 +101,12 @@ int uiomove_object(struct vm_object *obj, off_t obj_size, struct uio *uio); #else /* !_KERNEL */ +// zig patch: ssp/uio.h header was added in FreeBSD 15 +#if __FreeBSD_version >= 1500500 #if defined(_FORTIFY_SOURCE) && _FORTIFY_SOURCE > 0 #include #endif +#endif __BEGIN_DECLS ssize_t readv(int, const struct iovec *, int); diff --git a/lib/libc/include/generic-freebsd/unistd.h b/lib/libc/include/generic-freebsd/unistd.h index ce7dda335d59132524416210fb664511b1cf332a..5c52d5832734a6342dc0517c92b887e0bf3876fb 100644 --- a/lib/libc/include/generic-freebsd/unistd.h +++ b/lib/libc/include/generic-freebsd/unistd.h @@ -37,9 +37,12 @@ #include #include +// zig patch: ssp/unistd.h header was added in FreeBSD 15 +#if __FreeBSD_version >= 1500500 #if !defined(_STANDALONE) && defined(_FORTIFY_SOURCE) && _FORTIFY_SOURCE > 0 #include #endif +#endif #ifndef _GID_T_DECLARED typedef __gid_t gid_t; diff --git a/lib/libc/include/generic-freebsd/wchar.h b/lib/libc/include/generic-freebsd/wchar.h index b4f6504fbd0618b28aafccc85d5027c0679d2e79..4d98e65a715a8f6fb16220da17161032eeb5c766 100644 --- a/lib/libc/include/generic-freebsd/wchar.h +++ b/lib/libc/include/generic-freebsd/wchar.h @@ -112,9 +112,12 @@ __BEGIN_DECLS size_t wcslen(const wchar_t *) __pure; __END_DECLS +// zig patch: ssp/wchar.h header was added in FreeBSD 15 +#if __FreeBSD_version >= 1500500 #if !defined(_STANDALONE) && defined(_FORTIFY_SOURCE) && _FORTIFY_SOURCE > 0 #include #endif +#endif __BEGIN_DECLS wint_t btowc(int);