Commit 26f2749c1e843176c821bd9d5f527585ba43843f | zig

author	Alex Rønne Petersen <alex@alexrp.com> 2026-03-13 04:07:26+01:00
committer	Alex Rønne Petersen <alex@alexrp.com> 2026-03-13 04:07:26+01:00
log	26f2749c1e843176c821bd9d5f527585ba43843f
tree	b21fe830a40f2c8cccf509a873598fd1f67fac63
parent	627f03af9d90e0ac33834b4dd04a3a0adc9bbcef
parent	3e9ab94d290a52ae6119e92cb8a1e9d0ff4a7423

Merge pull request 'FreeBSD libc: guard ssp headers and definitions introduced in FreeBSD 15' (#31457) from kid/zig:fbsd-libc-guard into master

Reviewed-on: https://codeberg.org/ziglang/zig/pulls/31457
Reviewed-by: Alex Rønne Petersen <alex@alexrp.com>

26 files changed, 114 insertions(+), 0 deletions(-)

lib
- libc
  - include
    generic-freebsd
    poll.h
    signal.h
    ssp
    poll.h
    random.h
    signal.h
    socket.h
    ssp.h
    stdio.h
    stdlib.h
    string.h
    strings.h
    uio.h
    unistd.h
    wchar.h
    stdio.h
    stdlib.h
    string.h
    strings.h
    sys
    libkern.h
    poll.h
    random.h
    select.h
    socket.h
    uio.h
    unistd.h
    wchar.h

lib/libc/include/generic-freebsd/poll.h+3

...	...	@@ -109,9 +109,12 @@ typedef __sigset_t sigset_t;
109	109
110	110	#endif
111	111
	112	// zig patch: ssp/poll.h header was added in FreeBSD 15
	113	#if __FreeBSD_version >= 1500500
112	114	#if defined(_FORTIFY_SOURCE) && _FORTIFY_SOURCE > 0
113	115	#include <ssp/poll.h>
114	116	#endif
	117	#endif
115	118
116	119	__BEGIN_DECLS
117	120	int poll(struct pollfd _pfd[], nfds_t _nfds, int _timeout);

lib/libc/include/generic-freebsd/signal.h+3

...	...	@@ -72,9 +72,12 @@ typedef __pthread_t pthread_t;
72	72	#endif
73	73	#endif /* __POSIX_VISIBLE \|\| __XSI_VISIBLE */
74	74
	75	// zig patch: ssp/signal.h header was added in FreeBSD 15
	76	#if __FreeBSD_version >= 1500500
75	77	#if !defined(_STANDALONE) && defined(_FORTIFY_SOURCE) && _FORTIFY_SOURCE > 0
76	78	#include <ssp/signal.h>
77	79	#endif
	80	#endif
78	81
79	82	__BEGIN_DECLS
80	83	int raise(int);

lib/libc/include/generic-freebsd/ssp/poll.h+6

...	...	@@ -24,6 +24,12 @@
24	24	* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
25	25	* POSSIBILITY OF SUCH DAMAGE.
26	26	*/
	27
	28	// zig patch: ssp/poll.h header was added in FreeBSD 15
	29	#if __FreeBSD_version < 1500500
	30	#error "ssp/poll.h did not exist before FreeBSD 15"
	31	#endif /* error for FreeBSD before 15 */
	32
27	33	#ifndef _SSP_POLL_H_
28	34	#define _SSP_POLL_H_
29	35

lib/libc/include/generic-freebsd/ssp/random.h+6

...	...	@@ -24,6 +24,12 @@
24	24	* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
25	25	* POSSIBILITY OF SUCH DAMAGE.
26	26	*/
	27
	28	// zig patch: ssp/random.h header was added in FreeBSD 15
	29	#if __FreeBSD_version < 1500500
	30	#error "ssp/random.h did not exist before FreeBSD 15"
	31	#endif /* error for FreeBSD before 15 */
	32
27	33	#ifndef _SSP_RANDOM_H_
28	34	#define _SSP_RANDOM_H_
29	35

lib/libc/include/generic-freebsd/ssp/signal.h+6

...	...	@@ -24,6 +24,12 @@
24	24	* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
25	25	* POSSIBILITY OF SUCH DAMAGE.
26	26	*/
	27
	28	// zig patch: ssp/signal.h header was added in FreeBSD 15
	29	#if __FreeBSD_version < 1500500
	30	#error "ssp/signal.h did not exist before FreeBSD 15"
	31	#endif /* error for FreeBSD before 15 */
	32
27	33	#ifndef _SSP_SIGNAL_H_
28	34	#define _SSP_SIGNAL_H_
29	35

lib/libc/include/generic-freebsd/ssp/socket.h+6

...	...	@@ -24,6 +24,12 @@
24	24	* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
25	25	* POSSIBILITY OF SUCH DAMAGE.
26	26	*/
	27
	28	// zig patch: ssp/socket.h header was added in FreeBSD 15
	29	#if __FreeBSD_version < 1500500
	30	#error "ssp/socket.h did not exist before FreeBSD 15"
	31	#endif /* error for FreeBSD before 15 */
	32
27	33	#ifndef _SSP_SOCKET_H_
28	34	#define _SSP_SOCKET_H_
29	35

lib/libc/include/generic-freebsd/ssp/ssp.h+6

...	...	@@ -31,6 +31,12 @@
31	31	* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
32	32	* POSSIBILITY OF SUCH DAMAGE.
33	33	*/
	34
	35	// zig patch: ssp/ssp.h header was added in FreeBSD 15
	36	#if __FreeBSD_version < 1500500
	37	#error "ssp/ssp.h did not exist before FreeBSD 15"
	38	#endif /* error for FreeBSD before 15 */
	39
34	40	#ifndef _SSP_SSP_H_
35	41	#define _SSP_SSP_H_
36	42

lib/libc/include/generic-freebsd/ssp/stdio.h+6

...	...	@@ -31,6 +31,12 @@
31	31	* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
32	32	* POSSIBILITY OF SUCH DAMAGE.
33	33	*/
	34
	35	// zig patch: ssp/stdio.h header was added in FreeBSD 15
	36	#if __FreeBSD_version < 1500500
	37	#error "ssp/stdio.h did not exist before FreeBSD 15"
	38	#endif /* error for FreeBSD before 15 */
	39
34	40	#ifndef _SSP_STDIO_H_
35	41	#define _SSP_STDIO_H_
36	42

lib/libc/include/generic-freebsd/ssp/stdlib.h+6

...	...	@@ -24,6 +24,12 @@
24	24	* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
25	25	* POSSIBILITY OF SUCH DAMAGE.
26	26	*/
	27
	28	// zig patch: ssp/stdlib.h header was added in FreeBSD 15
	29	#if __FreeBSD_version < 1500500
	30	#error "ssp/stdlib.h did not exist before FreeBSD 15"
	31	#endif /* error for FreeBSD before 15 */
	32
27	33	#ifndef _SSP_STDLIB_H_
28	34	#define _SSP_STDLIB_H_
29	35

lib/libc/include/generic-freebsd/ssp/string.h+6

...	...	@@ -31,6 +31,12 @@
31	31	* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
32	32	* POSSIBILITY OF SUCH DAMAGE.
33	33	*/
	34
	35	// zig patch: ssp/string.h header was added in FreeBSD 15
	36	#if __FreeBSD_version < 1500500
	37	#error "ssp/string.h did not exist before FreeBSD 15"
	38	#endif /* error for FreeBSD before 15 */
	39
34	40	#ifndef _SSP_STRING_H_
35	41	#define _SSP_STRING_H_
36	42

lib/libc/include/generic-freebsd/ssp/strings.h+6

...	...	@@ -31,6 +31,12 @@
31	31	* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
32	32	* POSSIBILITY OF SUCH DAMAGE.
33	33	*/
	34
	35	// zig patch: ssp/strings.h header was added in FreeBSD 15
	36	#if __FreeBSD_version < 1500500
	37	#error "ssp/strings.h did not exist before FreeBSD 15"
	38	#endif /* error for FreeBSD before 15 */
	39
34	40	#ifndef _SSP_STRINGS_H_
35	41	#define _SSP_STRINGS_H_
36	42

lib/libc/include/generic-freebsd/ssp/uio.h+6

...	...	@@ -24,6 +24,12 @@
24	24	* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
25	25	* POSSIBILITY OF SUCH DAMAGE.
26	26	*/
	27
	28	// zig patch: ssp/uio.h header was added in FreeBSD 15
	29	#if __FreeBSD_version < 1500500
	30	#error "ssp/uio.h did not exist before FreeBSD 15"
	31	#endif /* error for FreeBSD before 15 */
	32
27	33	#ifndef _SSP_UIO_H_
28	34	#define _SSP_UIO_H_
29	35

lib/libc/include/generic-freebsd/ssp/unistd.h+6

...	...	@@ -31,6 +31,12 @@
31	31	* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
32	32	* POSSIBILITY OF SUCH DAMAGE.
33	33	*/
	34
	35	// zig patch: ssp/unistd.h header was added in FreeBSD 15
	36	#if __FreeBSD_version < 1500500
	37	#error "ssp/unistd.h did not exist before FreeBSD 15"
	38	#endif /* error for FreeBSD before 15 */
	39
34	40	#ifndef _SSP_UNISTD_H_
35	41	#define _SSP_UNISTD_H_
36	42

lib/libc/include/generic-freebsd/ssp/wchar.h+6

...	...	@@ -24,6 +24,12 @@
24	24	* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
25	25	* POSSIBILITY OF SUCH DAMAGE.
26	26	*/
	27
	28	// zig patch: ssp/wchar.h header was added in FreeBSD 15
	29	#if __FreeBSD_version < 1500500
	30	#error "ssp/wchar.h did not exist before FreeBSD 15"
	31	#endif /* error for FreeBSD before 15 */
	32
27	33	#ifndef _SSP_WCHAR_H_
28	34	#define _SSP_WCHAR_H_
29	35

lib/libc/include/generic-freebsd/stdio.h+3

...	...	@@ -252,9 +252,12 @@ __END_DECLS
252	252	#define L_ctermid 1024 /* size for ctermid(3); PATH_MAX */
253	253	#endif /* __POSIX_VISIBLE */
254	254
	255	// zig patch: ssp/stdio.h header was added in FreeBSD 15
	256	#if __FreeBSD_version >= 1500500
255	257	#if !defined(_STANDALONE) && defined(_FORTIFY_SOURCE) && _FORTIFY_SOURCE > 0
256	258	#include <ssp/stdio.h>
257	259	#endif
	260	#endif
258	261
259	262	__BEGIN_DECLS
260	263	#ifdef _XLOCALE_H_

lib/libc/include/generic-freebsd/stdlib.h+3

...	...	@@ -69,9 +69,12 @@ typedef struct {
69	69	*/
70	70	#define RAND_MAX 0x7fffffff
71	71
	72	// zig patch: ssp/stdlib.h header was added in FreeBSD 15
	73	#if __FreeBSD_version >= 1500500
72	74	#if !defined(_STANDALONE) && defined(_FORTIFY_SOURCE) && _FORTIFY_SOURCE > 0
73	75	#include <ssp/stdlib.h>
74	76	#endif
	77	#endif
75	78
76	79	__BEGIN_DECLS
77	80	#ifdef _XLOCALE_H_

lib/libc/include/generic-freebsd/string.h+3

...	...	@@ -49,9 +49,12 @@ typedef __size_t size_t;
49	49	#define _SIZE_T_DECLARED
50	50	#endif
51	51
	52	// zig patch: ssp/string.h header was added in FreeBSD 15
	53	#if __FreeBSD_version >= 1500500
52	54	#if !defined(_STANDALONE) && defined(_FORTIFY_SOURCE) && _FORTIFY_SOURCE > 0
53	55	#include <ssp/string.h>
54	56	#endif
	57	#endif
55	58
56	59	__BEGIN_DECLS
57	60	#if __XSI_VISIBLE >= 600 \|\| __ISO_C_VISIBLE >= 2023

lib/libc/include/generic-freebsd/strings.h+3

...	...	@@ -37,9 +37,12 @@ typedef __size_t size_t;
37	37	#define _SIZE_T_DECLARED
38	38	#endif
39	39
	40	// zig patch: ssp/strings.h header was added in FreeBSD 15
	41	#if __FreeBSD_version >= 1500500
40	42	#if !defined(_STANDALONE) && defined(_FORTIFY_SOURCE) && _FORTIFY_SOURCE > 0
41	43	#include <ssp/strings.h>
42	44	#endif
	45	#endif
43	46
44	47	__BEGIN_DECLS
45	48	#if __BSD_VISIBLE \|\| __POSIX_VISIBLE <= 200112

lib/libc/include/generic-freebsd/sys/libkern.h+3

...	...	@@ -334,10 +334,13 @@ signed_extend32(uint32_t bitmap, int lsb, int width)
334	334	#define FNM_IGNORECASE FNM_CASEFOLD
335	335	#define FNM_FILE_NAME FNM_PATHNAME
336	336
	337	// zig patch: ssp/ssp.h header and __ssp_real were added in FreeBSD 15
	338	#if __FreeBSD_version >= 1500500
337	339	#if !defined(_KERNEL) && __has_include(<ssp/ssp.h>)
338	340	#include <ssp/ssp.h> /* __ssp_real */
339	341	#else
340	342	#define __ssp_real(fun) fun
341	343	#endif
	344	#endif
342	345
343	346	#endif /* !_SYS_LIBKERN_H_ */
		\ No newline at end of file

lib/libc/include/generic-freebsd/sys/poll.h+3

...	...	@@ -109,9 +109,12 @@ typedef __sigset_t sigset_t;
109	109
110	110	#endif
111	111
	112	// zig patch: ssp/poll.h header was added in FreeBSD 15
	113	#if __FreeBSD_version >= 1500500
112	114	#if defined(_FORTIFY_SOURCE) && _FORTIFY_SOURCE > 0
113	115	#include <ssp/poll.h>
114	116	#endif
	117	#endif
115	118
116	119	__BEGIN_DECLS
117	120	int poll(struct pollfd _pfd[], nfds_t _nfds, int _timeout);

lib/libc/include/generic-freebsd/sys/random.h+3

...	...	@@ -156,9 +156,12 @@ random_harvest_direct(const void *entropy, u_int size, enum random_entropy_sourc
156	156
157	157	#else /* !_KERNEL */
158	158
	159	// zig patch: ssp/random.h header was added in FreeBSD 15
	160	#if __FreeBSD_version >= 1500500
159	161	#if defined(_FORTIFY_SOURCE) && _FORTIFY_SOURCE > 0
160	162	#include <ssp/random.h>
161	163	#endif
	164	#endif
162	165
163	166	#endif /* _KERNEL */
164	167

lib/libc/include/generic-freebsd/sys/select.h+3

...	...	@@ -49,11 +49,14 @@ typedef __fd_mask fd_mask;
49	49	typedef __sigset_t sigset_t;
50	50	#endif
51	51
	52	// zig patch: ssp/ssp.h header and __SSP_FORTIFY_LEVEL were added in FreeBSD 15
	53	#if __FreeBSD_version >= 1500500
52	54	#if !defined(_KERNEL) && defined(_FORTIFY_SOURCE) && _FORTIFY_SOURCE > 0
53	55	#include <ssp/ssp.h>
54	56	#else
55	57	#define __SSP_FORTIFY_LEVEL 0
56	58	#endif
	59	#endif
57	60
58	61	/*
59	62	* Select uses bit masks of file descriptors in longs. These macros

lib/libc/include/generic-freebsd/sys/socket.h+3

...	...	@@ -691,9 +691,12 @@ struct splice {
691	691
692	692	#ifndef _KERNEL
693	693
	694	// zig patch: ssp/socket.h header was added in FreeBSD 15
	695	#if __FreeBSD_version >= 1500500
694	696	#if defined(_FORTIFY_SOURCE) && _FORTIFY_SOURCE > 0
695	697	#include <ssp/socket.h>
696	698	#endif
	699	#endif
697	700
698	701	#include <sys/cdefs.h>
699	702

lib/libc/include/generic-freebsd/sys/uio.h+3

...	...	@@ -101,9 +101,12 @@ int uiomove_object(struct vm_object obj, off_t obj_size, struct uio uio);
101	101
102	102	#else /* !_KERNEL */
103	103
	104	// zig patch: ssp/uio.h header was added in FreeBSD 15
	105	#if __FreeBSD_version >= 1500500
104	106	#if defined(_FORTIFY_SOURCE) && _FORTIFY_SOURCE > 0
105	107	#include <ssp/uio.h>
106	108	#endif
	109	#endif
107	110
108	111	__BEGIN_DECLS
109	112	ssize_t readv(int, const struct iovec *, int);

lib/libc/include/generic-freebsd/unistd.h+3

...	...	@@ -37,9 +37,12 @@
37	37	#include <sys/_null.h>
38	38	#include <sys/_types.h>
39	39
	40	// zig patch: ssp/unistd.h header was added in FreeBSD 15
	41	#if __FreeBSD_version >= 1500500
40	42	#if !defined(_STANDALONE) && defined(_FORTIFY_SOURCE) && _FORTIFY_SOURCE > 0
41	43	#include <ssp/unistd.h>
42	44	#endif
	45	#endif
43	46
44	47	#ifndef _GID_T_DECLARED
45	48	typedef __gid_t gid_t;

lib/libc/include/generic-freebsd/wchar.h+3

...	...	@@ -112,9 +112,12 @@ __BEGIN_DECLS
112	112	size_t wcslen(const wchar_t *) __pure;
113	113	__END_DECLS
114	114
	115	// zig patch: ssp/wchar.h header was added in FreeBSD 15
	116	#if __FreeBSD_version >= 1500500
115	117	#if !defined(_STANDALONE) && defined(_FORTIFY_SOURCE) && _FORTIFY_SOURCE > 0
116	118	#include <ssp/wchar.h>
117	119	#endif
	120	#endif
118	121
119	122	__BEGIN_DECLS
120	123	wint_t btowc(int);