From 7d234f26de8caf77e9b3b0f1278d6e815e27c9f1 Mon Sep 17 00:00:00 2001
From: Augustin Cavalier <waddlesplash@gmail.com>
Date: Thu, 8 Jan 2026 15:48:50 -0500
Subject: [PATCH] strtok_r: Include features.h and reinstate "restrict".

---
 src/system/kernel/lib/Jamfile                   | 2 +-
 src/system/libroot/posix/musl/string/strtok_r.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/system/kernel/lib/Jamfile b/src/system/kernel/lib/Jamfile
index c6c0467b04..fac2767531 100644
--- a/src/system/kernel/lib/Jamfile
+++ b/src/system/kernel/lib/Jamfile
@@ -54,6 +54,7 @@ local muslSources =
 	ffsll.c
 	rand.c
 	rand_r.c
+	strtok_r.c
 	;
 
 SourceHdrs $(muslSources) :
@@ -148,7 +149,6 @@ KernelMergeObject kernel_lib_posix.o :
 	strspn.c
 	strstr.c
 	strtok.c
-	strtok_r.c
 	strupr.c
 
 	$(muslSources)
diff --git a/src/system/libroot/posix/musl/string/strtok_r.c b/src/system/libroot/posix/musl/string/strtok_r.c
index c763897afa..e3fee170b2 100644
--- a/src/system/libroot/posix/musl/string/strtok_r.c
+++ b/src/system/libroot/posix/musl/string/strtok_r.c
@@ -1,6 +1,7 @@
 #include <string.h>
+#include "features.h"
 
-char *strtok_r(char *s, const char *sep, char **p)
+char *strtok_r(char *restrict s, const char *restrict sep, char **restrict p)
 {
 	if (!s && !(s = *p)) return NULL;
 	s += strspn(s, sep);