@zigc/lib 0.17.0-dev.607 → 0.17.0-dev.644

package/libc/include/generic-netbsd/sys/sysctl.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: sysctl.h,v 1.236 2021/09/16 22:47:29 christos Exp $	*/
+/*	$NetBSD: sysctl.h,v 1.241 2025/07/13 20:13:39 christos Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -73,10 +73,10 @@
 struct sysctlnode;
 
 #define	CTL_MAXNAME	12	/* largest number of components supported */
-#define SYSCTL_NAMELEN	32	/* longest name allowed for a node */
+#define	SYSCTL_NAMELEN	32	/* longest name allowed for a node */
 
-#define CREATE_BASE	(1024)	/* start of dynamic mib allocation */
-#define SYSCTL_DEFSIZE	8	/* initial size of a child set */
+#define	CREATE_BASE	(1024)	/* start of dynamic mib allocation */
+#define	SYSCTL_DEFSIZE	8	/* initial size of a child set */
 
 /*
  * Each subsystem defined by sysctl defines a list of variables
@@ -105,38 +105,38 @@ struct ctlname {
 /*
  * Flags that apply to each node, governing access and other features
  */
-#define CTLFLAG_READONLY	0x00000000
+#define	CTLFLAG_READONLY	0x00000000
 /* #define CTLFLAG_UNUSED1		0x00000010 */
 /* #define CTLFLAG_UNUSED2		0x00000020 */
 /* #define CTLFLAG_READ*	0x00000040 */
-#define CTLFLAG_READWRITE	0x00000070
-#define CTLFLAG_ANYWRITE	0x00000080
-#define CTLFLAG_PRIVATE		0x00000100
-#define CTLFLAG_PERMANENT	0x00000200
-#define CTLFLAG_OWNDATA		0x00000400
-#define CTLFLAG_IMMEDIATE	0x00000800
-#define CTLFLAG_HEX		0x00001000
-#define CTLFLAG_ROOT		0x00002000
-#define CTLFLAG_ANYNUMBER	0x00004000
-#define CTLFLAG_HIDDEN		0x00008000
-#define CTLFLAG_ALIAS		0x00010000
-#define CTLFLAG_MMAP		0x00020000
-#define CTLFLAG_OWNDESC		0x00040000
-#define CTLFLAG_UNSIGNED	0x00080000
+#define	CTLFLAG_READWRITE	0x00000070
+#define	CTLFLAG_ANYWRITE	0x00000080
+#define	CTLFLAG_PRIVATE		0x00000100
+#define	CTLFLAG_PERMANENT	0x00000200
+#define	CTLFLAG_OWNDATA		0x00000400
+#define	CTLFLAG_IMMEDIATE	0x00000800
+#define	CTLFLAG_HEX		0x00001000
+#define	CTLFLAG_ROOT		0x00002000
+#define	CTLFLAG_ANYNUMBER	0x00004000
+#define	CTLFLAG_HIDDEN		0x00008000
+#define	CTLFLAG_ALIAS		0x00010000
+#define	CTLFLAG_MMAP		0x00020000
+#define	CTLFLAG_OWNDESC		0x00040000
+#define	CTLFLAG_UNSIGNED	0x00080000
 
 /*
  * sysctl API version
  */
-#define SYSCTL_VERS_MASK	0xff000000
-#define SYSCTL_VERS_0		0x00000000
-#define SYSCTL_VERS_1		0x01000000
-#define SYSCTL_VERSION		SYSCTL_VERS_1
-#define SYSCTL_VERS(f)		((f) & SYSCTL_VERS_MASK)
+#define	SYSCTL_VERS_MASK	0xff000000
+#define	SYSCTL_VERS_0		0x00000000
+#define	SYSCTL_VERS_1		0x01000000
+#define	SYSCTL_VERSION		SYSCTL_VERS_1
+#define	SYSCTL_VERS(f)		((f) & SYSCTL_VERS_MASK)
 
 /*
  * Flags that can be set by a create request from user-space
  */
-#define SYSCTL_USERFLAGS	(CTLFLAG_READWRITE|\
+#define	SYSCTL_USERFLAGS	(CTLFLAG_READWRITE|\
 				CTLFLAG_ANYWRITE|\
 				CTLFLAG_PRIVATE|\
 				CTLFLAG_OWNDATA|\
@@ -147,21 +147,21 @@ struct ctlname {
 /*
  * Accessor macros
  */
-#define SYSCTL_TYPEMASK		0x0000000f
-#define SYSCTL_TYPE(x)		((x) & SYSCTL_TYPEMASK)
-#define SYSCTL_FLAGMASK		0x00fffff0
-#define SYSCTL_FLAGS(x)		((x) & SYSCTL_FLAGMASK)
+#define	SYSCTL_TYPEMASK		0x0000000f
+#define	SYSCTL_TYPE(x)		((x) & SYSCTL_TYPEMASK)
+#define	SYSCTL_FLAGMASK		0x00fffff0
+#define	SYSCTL_FLAGS(x)		((x) & SYSCTL_FLAGMASK)
 
 /*
  * Meta-identifiers
  */
-#define CTL_EOL		(-1)		/* end of createv/destroyv list */
-#define CTL_QUERY	(-2)		/* enumerates children of a node */
-#define CTL_CREATE	(-3)		/* node create request */
-#define CTL_CREATESYM	(-4)		/* node create request with symbol */
-#define CTL_DESTROY	(-5)		/* node destroy request */
-#define CTL_MMAP	(-6)		/* mmap request */
-#define CTL_DESCRIBE	(-7)		/* get node descriptions */
+#define	CTL_EOL		(-1)		/* end of createv/destroyv list */
+#define	CTL_QUERY	(-2)		/* enumerates children of a node */
+#define	CTL_CREATE	(-3)		/* node create request */
+#define	CTL_CREATESYM	(-4)		/* node create request with symbol */
+#define	CTL_DESTROY	(-5)		/* node destroy request */
+#define	CTL_MMAP	(-6)		/* mmap request */
+#define	CTL_DESCRIBE	(-7)		/* get node descriptions */
 
 /*
  * Top-level identifiers
@@ -275,6 +275,7 @@ struct ctlname {
 #define	KERN_BOOTTIME		83	/* struct: time kernel was booted */
 #define	KERN_EVCNT		84	/* struct: evcnts */
 #define	KERN_SOFIXEDBUF		85	/* bool: fixed socket buffer sizes */
+#define	KERN_ENTROPY		86	/* node: entropy(9) subsystem */
 
 /*
  *  KERN_CLOCKRATE structure
@@ -362,8 +363,8 @@ struct kinfo_proc {
  * Convert pointer to 64 bit unsigned integer for struct
  * kinfo_proc2, etc.
  */
-#define PTRTOUINT64(p) ((uint64_t)(uintptr_t)(p))
-#define UINT64TOPTR(u) ((void *)(uintptr_t)(u))
+#define	PTRTOUINT64(p) ((uint64_t)(uintptr_t)(p))
+#define	UINT64TOPTR(u) ((void *)(uintptr_t)(u))
 
 /*
  * KERN_PROC2 subtype ops return arrays of relatively fixed size
@@ -378,7 +379,7 @@ struct kinfo_proc {
 #define	KI_MAXEMULLEN	16
 #define	KI_LNAMELEN	20	/* extra 4 for alignment */
 
-#define KI_NOCPU	(~(uint64_t)0)
+#define	KI_NOCPU	(~(uint64_t)0)
 
 typedef struct {
 	uint32_t	__bits[4];
@@ -779,6 +780,12 @@ struct hashstat_sysctl {
 typedef int	(*hashstat_func_t)(struct hashstat_sysctl *, bool);
 void		hashstat_register(const char *, hashstat_func_t);
 
+/*
+ * kern.entropy.* variables
+ */
+
+#define	KERN_ENTROPY_EPOCH	1	/* int: PRNG reseed epoch */
+
 /*
  * CTL_VM identifiers in <uvm/uvm_param.h>
  */
@@ -929,7 +936,7 @@ struct kinfo_vmentry {
 #define	PROC_PID_LIMIT_CORE	(RLIMIT_CORE+1)
 #define	PROC_PID_LIMIT_RSS	(RLIMIT_RSS+1)
 #define	PROC_PID_LIMIT_MEMLOCK	(RLIMIT_MEMLOCK+1)
-#define PROC_PID_LIMIT_NPROC	(RLIMIT_NPROC+1)
+#define	PROC_PID_LIMIT_NPROC	(RLIMIT_NPROC+1)
 #define	PROC_PID_LIMIT_NOFILE	(RLIMIT_NOFILE+1)
 #define	PROC_PID_LIMIT_SBSIZE	(RLIMIT_SBSIZE+1)
 #define	PROC_PID_LIMIT_AS	(RLIMIT_AS+1)
@@ -1004,15 +1011,15 @@ extern struct ctldebug debug10, debug11, debug12, debug13, debug14;
 extern struct ctldebug debug15, debug16, debug17, debug18, debug19;
 #endif	/* DEBUG */
 
-#define SYSCTLFN_PROTO const int *, u_int, void *, \
+#define	SYSCTLFN_PROTO const int *, u_int, void *, \
 	size_t *, const void *, size_t, \
 	const int *, struct lwp *, const struct sysctlnode *
-#define SYSCTLFN_ARGS const int *name, u_int namelen, \
+#define	SYSCTLFN_ARGS const int *name, u_int namelen, \
 	void *oldp, size_t *oldlenp, \
 	const void *newp, size_t newlen, \
 	const int *oname, struct lwp *l, \
 	const struct sysctlnode *rnode
-#define SYSCTLFN_CALL(node) name, namelen, oldp, \
+#define	SYSCTLFN_CALL(node) name, namelen, oldp, \
 	oldlenp, newp, newlen, \
 	oname, l, node
 
@@ -1024,7 +1031,7 @@ struct sysctl_setup_chain {
 	LIST_ENTRY(sysctl_setup_chain) ssc_entries;
 };
 LIST_HEAD(sysctl_boot_chain, sysctl_setup_chain);
-#define _SYSCTL_REGISTER(name)						\
+#define	_SYSCTL_REGISTER(name)						\
 static struct sysctl_setup_chain __CONCAT(ssc,name) = {			\
 	.ssc_func = name,						\
 };									\
@@ -1048,16 +1055,16 @@ static void sysctldtor_##name(void)					\
 
 #else /* RUMP_USE_CTOR */
 
-#define _SYSCTL_REGISTER(name) __link_set_add_text(sysctl_funcs, name);
+#define	_SYSCTL_REGISTER(name) __link_set_add_text(sysctl_funcs, name);
 
 #endif /* RUMP_USE_CTOR */
 
 #ifdef _MODULE
 
-#define SYSCTL_SETUP_PROTO(name)				\
+#define	SYSCTL_SETUP_PROTO(name)				\
 	void name(struct sysctllog **)
 #ifdef SYSCTL_DEBUG_SETUP
-#define SYSCTL_SETUP(name, desc)				\
+#define	SYSCTL_SETUP(name, desc)				\
 	SYSCTL_SETUP_PROTO(name);				\
 	static void __CONCAT(___,name)(struct sysctllog **);	\
 	void name(struct sysctllog **clog) {			\
@@ -1066,7 +1073,7 @@ static void sysctldtor_##name(void)					\
 	_SYSCTL_REGISTER(name);					\
 	static void __CONCAT(___,name)(struct sysctllog **clog)
 #else  /* !SYSCTL_DEBUG_SETUP */
-#define SYSCTL_SETUP(name, desc)				\
+#define	SYSCTL_SETUP(name, desc)				\
 	SYSCTL_SETUP_PROTO(name);				\
 	_SYSCTL_REGISTER(name);					\
 	void name(struct sysctllog **clog)
@@ -1074,9 +1081,9 @@ static void sysctldtor_##name(void)					\
 
 #else /* !_MODULE */
 
-#define SYSCTL_SETUP_PROTO(name)
+#define	SYSCTL_SETUP_PROTO(name)
 #ifdef SYSCTL_DEBUG_SETUP
-#define SYSCTL_SETUP(name, desc)				\
+#define	SYSCTL_SETUP(name, desc)				\
 	static void __CONCAT(___,name)(struct sysctllog **);	\
 	static void name(struct sysctllog **clog) {		\
 		printf("%s\n", desc);				\
@@ -1084,7 +1091,7 @@ static void sysctldtor_##name(void)					\
 	_SYSCTL_REGISTER(name);					\
 	static void __CONCAT(___,name)(struct sysctllog **clog)
 #else  /* !SYSCTL_DEBUG_SETUP */
-#define SYSCTL_SETUP(name, desc)				\
+#define	SYSCTL_SETUP(name, desc)				\
 	static void name(struct sysctllog **);			\
 	_SYSCTL_REGISTER(name);					\
 	static void name(struct sysctllog **clog)
@@ -1147,23 +1154,23 @@ int	sysctl_createv(struct sysctllog **, int,
 		       sysctlfn, u_quad_t, void *, size_t, ...);
 int	sysctl_destroyv(struct sysctlnode *, ...);
 
-#define VERIFY_FN(ctl_type, c_type) \
+#define	VERIFY_FN(ctl_type, c_type) \
 __always_inline static __inline void * \
 __sysctl_verify_##ctl_type##_arg(c_type *arg) \
 { \
     return arg; \
 }
 
-VERIFY_FN(CTLTYPE_NODE, struct sysctlnode);
-VERIFY_FN(CTLTYPE_INT, int);
-VERIFY_FN(CTLTYPE_STRING, char);
-VERIFY_FN(CTLTYPE_QUAD, int64_t);
-VERIFY_FN(CTLTYPE_STRUCT, void);
-VERIFY_FN(CTLTYPE_BOOL, bool);
-VERIFY_FN(CTLTYPE_LONG, long);
+VERIFY_FN(CTLTYPE_NODE, struct sysctlnode)
+VERIFY_FN(CTLTYPE_INT, int)
+VERIFY_FN(CTLTYPE_STRING, char)
+VERIFY_FN(CTLTYPE_QUAD, int64_t)
+VERIFY_FN(CTLTYPE_STRUCT, void)
+VERIFY_FN(CTLTYPE_BOOL, bool)
+VERIFY_FN(CTLTYPE_LONG, long)
 #undef VERIFY_FN
 
-#define sysctl_createv(lg, cfl, rn, cn, fl, type, nm, desc, fn, qv, newp, ...) \
+#define	sysctl_createv(lg, cfl, rn, cn, fl, type, nm, desc, fn, qv, newp, ...) \
     sysctl_createv(lg, cfl, rn, cn, fl, type, nm, desc, fn, qv, \
 	    __sysctl_verify_##type##_arg(newp), __VA_ARGS__)
 
@@ -1176,9 +1183,9 @@ void	sysctl_teardown(struct sysctllog **);
 void	sysctl_log_print(const struct sysctllog *);
 
 #ifdef SYSCTL_INCLUDE_DESCR
-#define SYSCTL_DESCR(s) s
+#define	SYSCTL_DESCR(s) s
 #else /* SYSCTL_INCLUDE_DESCR */
-#define SYSCTL_DESCR(s) NULL
+#define	SYSCTL_DESCR(s) NULL
 #endif /* SYSCTL_INCLUDE_DESCR */
 
 /*
@@ -1231,6 +1238,7 @@ int	proc_compare(const struct kinfo_proc2 *, const struct kinfo_lwp *,
     const struct kinfo_proc2 *, const struct kinfo_lwp *);
 void	*asysctl(const int *, size_t, size_t *);
 void	*asysctlbyname(const char *, size_t *);
+int	__learn_tree(int *, u_int, struct sysctlnode *);
 __END_DECLS
 
 #endif	/* !_KERNEL */
@@ -1246,19 +1254,19 @@ __END_DECLS
  * the expense of making things bigger on 32 bit platforms.
  */
 #if defined(_LP64) || (BYTE_ORDER == LITTLE_ENDIAN)
-#define __sysc_pad(type) union { uint64_t __sysc_upad; \
+#define	__sysc_pad(type) union { uint64_t __sysc_upad; \
 	struct { type __sysc_sdatum; } __sysc_ustr; }
 #else
-#define __sysc_pad(type) union { uint64_t __sysc_upad; \
+#define	__sysc_pad(type) union { uint64_t __sysc_upad; \
 	struct { uint32_t __sysc_spad; type __sysc_sdatum; } __sysc_ustr; }
 #endif
-#define __sysc_unpad(x) x.__sysc_ustr.__sysc_sdatum
+#define	__sysc_unpad(x) x.__sysc_ustr.__sysc_sdatum
 
 /*
  * The following is for gcc2, which doesn't handle __sysc_unpad().
  * The code gets a little less ugly this way.
  */
-#define sysc_init_field(field, value) 	\
+#define	sysc_init_field(field, value) 	\
 	.field = { .__sysc_ustr = { .__sysc_sdatum = (value), }, }
 
 struct sysctlnode {
@@ -1291,26 +1299,26 @@ struct sysctlnode {
 /*
  * padded data
  */
-#define suc_child	__sysc_unpad(_suc_child)
-#define sud_data	__sysc_unpad(_sud_data)
-#define sud_offset	__sysc_unpad(_sud_offset)
-#define sysctl_size	__sysc_unpad(_sysctl_size)
-#define sysctl_func	__sysc_unpad(_sysctl_func)
-#define sysctl_parent	__sysc_unpad(_sysctl_parent)
-#define sysctl_desc	__sysc_unpad(_sysctl_desc)
+#define	suc_child	__sysc_unpad(_suc_child)
+#define	sud_data	__sysc_unpad(_sud_data)
+#define	sud_offset	__sysc_unpad(_sud_offset)
+#define	sysctl_size	__sysc_unpad(_sysctl_size)
+#define	sysctl_func	__sysc_unpad(_sysctl_func)
+#define	sysctl_parent	__sysc_unpad(_sysctl_parent)
+#define	sysctl_desc	__sysc_unpad(_sysctl_desc)
 
 /*
  * nested data (may also be padded)
  */
-#define sysctl_csize	sysctl_un.scu_child.suc_csize
-#define sysctl_clen	sysctl_un.scu_child.suc_clen
-#define sysctl_child	sysctl_un.scu_child.suc_child
-#define sysctl_data	sysctl_un.scu_data.sud_data
-#define sysctl_offset	sysctl_un.scu_data.sud_offset
-#define sysctl_alias	sysctl_un.scu_alias
-#define sysctl_idata	sysctl_un.scu_idata
-#define sysctl_qdata	sysctl_un.scu_qdata
-#define sysctl_bdata	sysctl_un.scu_bdata
+#define	sysctl_csize	sysctl_un.scu_child.suc_csize
+#define	sysctl_clen	sysctl_un.scu_child.suc_clen
+#define	sysctl_child	sysctl_un.scu_child.suc_child
+#define	sysctl_data	sysctl_un.scu_data.sud_data
+#define	sysctl_offset	sysctl_un.scu_data.sud_offset
+#define	sysctl_alias	sysctl_un.scu_alias
+#define	sysctl_idata	sysctl_un.scu_idata
+#define	sysctl_qdata	sysctl_un.scu_qdata
+#define	sysctl_bdata	sysctl_un.scu_bdata
 
 /*
  * when requesting a description of a node (a set of nodes, actually),
@@ -1328,13 +1336,13 @@ struct sysctldesc {
 	char		descr_str[1];	/* not really 1...see above */
 };
 
-#define __sysc_desc_roundup(x) ((((x) - 1) | (sizeof(int32_t) - 1)) + 1)
-#define __sysc_desc_len(l) (offsetof(struct sysctldesc, descr_str) +\
+#define	__sysc_desc_roundup(x) ((((x) - 1) | (sizeof(int32_t) - 1)) + 1)
+#define	__sysc_desc_len(l) (offsetof(struct sysctldesc, descr_str) +\
 		__sysc_desc_roundup(l))
-#define __sysc_desc_adv(d, l) \
+#define	__sysc_desc_adv(d, l) \
 	(/*XXXUNCONST ptr cast*/(struct sysctldesc *) \
 	__UNCONST(((const char*)(d)) + __sysc_desc_len(l)))
-#define NEXT_DESCR(d) __sysc_desc_adv((d), (d)->descr_len)
+#define	NEXT_DESCR(d) __sysc_desc_adv((d), (d)->descr_len)
 
 static __inline const struct sysctlnode *
 sysctl_rootof(const struct sysctlnode *n)

package/libc/include/generic-netbsd/sys/syslimits.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: syslimits.h,v 1.28 2015/08/21 07:19:39 uebayasi Exp $	*/
+/*	$NetBSD: syslimits.h,v 1.29 2024/12/22 23:18:29 riastradh Exp $	*/
 
 /*
  * Copyright (c) 1988, 1993
@@ -69,6 +69,13 @@
 #define	LINE_MAX		 2048	/* max bytes in an input line */
 #define	RE_DUP_MAX		  255	/* max RE's in interval notation */
 
+/*
+ * POSIX Realtime Extension (1003.1b-1993)
+ */
+#if (_POSIX_C_SOURCE - 0) >= 199309L || defined(_NETBSD_SOURCE)
+#define	DELAYTIMER_MAX		   32	/* max timer_overrun() value */
+#endif
+
 /*
  * IEEE Std 1003.1c-95, adopted in X/Open CAE Specification Issue 5 Version 2
  */

package/libc/include/generic-netbsd/sys/syslog.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: syslog.h,v 1.41.44.1 2024/10/08 11:16:17 martin Exp $	*/
+/*	$NetBSD: syslog.h,v 1.44 2024/08/21 16:30:27 gutteridge Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1988, 1993
@@ -62,12 +62,11 @@
 #define	LOG_PRIMASK	0x07	/* mask to extract priority part (internal) */
 				/* extract priority */
 #define	LOG_PRI(p)	((p) & LOG_PRIMASK)
-#define	LOG_MAKEPRI(fac, pri)	(((fac) << 3) | (pri))
 
 #ifdef SYSLOG_NAMES
 #define	INTERNAL_NOPRI	0x10	/* the "no priority" priority */
 				/* mark "facility" */
-#define	INTERNAL_MARK	LOG_MAKEPRI(LOG_NFACILITIES, 0)
+#define	INTERNAL_MARK	(LOG_NFACILITIES<<3)
 typedef struct _code {
 	const char	*c_name;
 	int	c_val;
@@ -222,11 +221,11 @@ void	vsyslogp_r(int, struct syslog_data *, const char *, const char *,
     const char *, __va_list) __RENAME(__vsyslogp_r60) __sysloglike(5, 0);
 void	syslog_ss(int, struct syslog_data *, const char *, ...)
     __RENAME(__syslog_ss60) __sysloglike(3, 4);
-void    vsyslog_ss(int, struct syslog_data *, const char *, va_list) 
-    __RENAME(__vsyslog_ss60) __sysloglike(3, 0); 
-void	syslogp_ss(int, struct syslog_data *, const char *, const char *, 
+void    vsyslog_ss(int, struct syslog_data *, const char *, va_list)
+    __RENAME(__vsyslog_ss60) __sysloglike(3, 0);
+void	syslogp_ss(int, struct syslog_data *, const char *, const char *,
     const char *, ...) __RENAME(__syslogp_ss60) __sysloglike(5, 0);
-void	vsyslogp_ss(int, struct syslog_data *, const char *, const char *, 
+void	vsyslogp_ss(int, struct syslog_data *, const char *, const char *,
     const char *, va_list) __RENAME(__vsyslogp_ss60) __sysloglike(5, 0);
 #endif
 void	syslogp(int, const char *, const char *, const char *, ...)

package/libc/include/generic-netbsd/sys/time.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: time.h,v 1.80 2022/06/26 22:31:38 riastradh Exp $	*/
+/*	$NetBSD: time.h,v 1.82 2024/12/22 23:24:20 riastradh Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1993
@@ -52,11 +52,11 @@ struct timeval {
 #define	TIMEVAL_TO_TIMESPEC(tv, ts) do {				\
 	(ts)->tv_sec = (tv)->tv_sec;					\
 	(ts)->tv_nsec = (tv)->tv_usec * 1000;				\
-} while (/*CONSTCOND*/0)
+} while (0)
 #define	TIMESPEC_TO_TIMEVAL(tv, ts) do {				\
 	(tv)->tv_sec = (ts)->tv_sec;					\
 	(tv)->tv_usec = (suseconds_t)(ts)->tv_nsec / 1000;		\
-} while (/*CONSTCOND*/0)
+} while (0)
 
 /*
  * Note: timezone is obsolete. All timezone handling is now in
@@ -82,7 +82,7 @@ struct timezone {
 			(vvp)->tv_sec++;				\
 			(vvp)->tv_usec -= 1000000;			\
 		}							\
-	} while (/* CONSTCOND */ 0)
+	} while (0)
 #define	timersub(tvp, uvp, vvp)						\
 	do {								\
 		(vvp)->tv_sec = (tvp)->tv_sec - (uvp)->tv_sec;		\
@@ -91,7 +91,7 @@ struct timezone {
 			(vvp)->tv_sec--;				\
 			(vvp)->tv_usec += 1000000;			\
 		}							\
-	} while (/* CONSTCOND */ 0)
+	} while (0)
 
 /*
  * hide bintime for _STANDALONE because this header is used for hpcboot.exe,
@@ -254,7 +254,7 @@ ns2bintime(uint64_t ns)
 			(vsp)->tv_sec++;				\
 			(vsp)->tv_nsec -= 1000000000L;			\
 		}							\
-	} while (/* CONSTCOND */ 0)
+	} while (0)
 #define	timespecsub(tsp, usp, vsp)					\
 	do {								\
 		(vsp)->tv_sec = (tsp)->tv_sec - (usp)->tv_sec;		\
@@ -263,10 +263,11 @@ ns2bintime(uint64_t ns)
 			(vsp)->tv_sec--;				\
 			(vsp)->tv_nsec += 1000000000L;			\
 		}							\
-	} while (/* CONSTCOND */ 0)
+	} while (0)
 #define timespec2ns(x) (((uint64_t)(x)->tv_sec) * 1000000000L + (x)->tv_nsec)
 
-#ifdef _KERNEL
+#if defined(_KERNEL) || defined(_TIME_TESTING)
+#include <sys/stdbool.h>
 bool timespecaddok(const struct timespec *, const struct timespec *) __pure;
 bool timespecsubok(const struct timespec *, const struct timespec *) __pure;
 #endif
@@ -310,6 +311,7 @@ struct	itimerspec {
 #define	TIMER_ABSTIME	0x1	/* absolute timer */
 
 #ifdef _KERNEL
+#include <sys/timearith.h>
 #include <sys/timevar.h>
 #else /* !_KERNEL */
 #ifndef _STANDALONE

package/libc/include/generic-netbsd/sys/tree.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: tree.h,v 1.20 2013/09/14 13:20:45 joerg Exp $	*/
+/*	$NetBSD: tree.h,v 1.21 2024/05/12 10:34:56 rillig Exp $	*/
 /*	$OpenBSD: tree.h,v 1.13 2011/07/09 00:19:45 pirofti Exp $	*/
 /*
  * Copyright 2002 Niels Provos <provos@citi.umich.edu>
@@ -65,7 +65,7 @@ struct name {								\
 
 #define SPLAY_INIT(root) do {						\
 	(root)->sph_root = NULL;					\
-} while (/*CONSTCOND*/ 0)
+} while (0)
 
 #define SPLAY_ENTRY(type)						\
 struct {								\
@@ -83,32 +83,32 @@ struct {								\
 	SPLAY_LEFT((head)->sph_root, field) = SPLAY_RIGHT(tmp, field);	\
 	SPLAY_RIGHT(tmp, field) = (head)->sph_root;			\
 	(head)->sph_root = tmp;						\
-} while (/*CONSTCOND*/ 0)
+} while (0)
 
 #define SPLAY_ROTATE_LEFT(head, tmp, field) do {			\
 	SPLAY_RIGHT((head)->sph_root, field) = SPLAY_LEFT(tmp, field);	\
 	SPLAY_LEFT(tmp, field) = (head)->sph_root;			\
 	(head)->sph_root = tmp;						\
-} while (/*CONSTCOND*/ 0)
+} while (0)
 
 #define SPLAY_LINKLEFT(head, tmp, field) do {				\
 	SPLAY_LEFT(tmp, field) = (head)->sph_root;			\
 	tmp = (head)->sph_root;						\
 	(head)->sph_root = SPLAY_LEFT((head)->sph_root, field);		\
-} while (/*CONSTCOND*/ 0)
+} while (0)
 
 #define SPLAY_LINKRIGHT(head, tmp, field) do {				\
 	SPLAY_RIGHT(tmp, field) = (head)->sph_root;			\
 	tmp = (head)->sph_root;						\
 	(head)->sph_root = SPLAY_RIGHT((head)->sph_root, field);	\
-} while (/*CONSTCOND*/ 0)
+} while (0)
 
 #define SPLAY_ASSEMBLE(head, node, left, right, field) do {		\
 	SPLAY_RIGHT(left, field) = SPLAY_LEFT((head)->sph_root, field);	\
 	SPLAY_LEFT(right, field) = SPLAY_RIGHT((head)->sph_root, field);\
 	SPLAY_LEFT((head)->sph_root, field) = SPLAY_RIGHT(node, field);	\
 	SPLAY_RIGHT((head)->sph_root, field) = SPLAY_LEFT(node, field);	\
-} while (/*CONSTCOND*/ 0)
+} while (0)
 
 /* Generates prototypes and inline functions */
 
@@ -299,7 +299,7 @@ struct name {								\
 
 #define RB_INIT(root) do {						\
 	(root)->rbh_root = NULL;					\
-} while (/*CONSTCOND*/ 0)
+} while (0)
 
 #define RB_BLACK	0
 #define RB_RED		1
@@ -322,15 +322,15 @@ struct {								\
 	RB_PARENT(elm, field) = parent;					\
 	RB_LEFT(elm, field) = RB_RIGHT(elm, field) = NULL;		\
 	RB_COLOR(elm, field) = RB_RED;					\
-} while (/*CONSTCOND*/ 0)
+} while (0)
 
 #define RB_SET_BLACKRED(black, red, field) do {				\
 	RB_COLOR(black, field) = RB_BLACK;				\
 	RB_COLOR(red, field) = RB_RED;					\
-} while (/*CONSTCOND*/ 0)
+} while (0)
 
 #ifndef RB_AUGMENT
-#define RB_AUGMENT(x)	do {} while (/*CONSTCOND*/ 0)
+#define RB_AUGMENT(x)	do {} while (0)
 #endif
 
 #define RB_ROTATE_LEFT(head, elm, tmp, field) do {			\
@@ -351,7 +351,7 @@ struct {								\
 	RB_AUGMENT(tmp);						\
 	if ((RB_PARENT(tmp, field)))					\
 		RB_AUGMENT(RB_PARENT(tmp, field));			\
-} while (/*CONSTCOND*/ 0)
+} while (0)
 
 #define RB_ROTATE_RIGHT(head, elm, tmp, field) do {			\
 	(tmp) = RB_LEFT(elm, field);					\
@@ -371,7 +371,7 @@ struct {								\
 	RB_AUGMENT(tmp);						\
 	if ((RB_PARENT(tmp, field)))					\
 		RB_AUGMENT(RB_PARENT(tmp, field));			\
-} while (/*CONSTCOND*/ 0)
+} while (0)
 
 /* Generates prototypes and inline functions */
 #define RB_PROTOTYPE(name, type, field, cmp)				\

package/libc/include/generic-netbsd/sys/tty.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: tty.h,v 1.103 2022/10/26 23:41:49 riastradh Exp $	*/
+/*	$NetBSD: tty.h,v 1.104 2023/04/12 06:35:26 riastradh Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -285,7 +285,7 @@ int	 ttstart(struct tty *);
 void	 ttwakeup(struct tty *);
 int	 ttwrite(struct tty *, struct uio *, int);
 void	 ttychars(struct tty *);
-int	 ttycheckoutq(struct tty *, int);
+int	 ttycheckoutq(struct tty *);
 void	 ttycancel(struct tty *);
 int	 ttyclose(struct tty *);
 void	 ttyflush(struct tty *, int);

package/libc/include/generic-netbsd/sys/ttycom.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: ttycom.h,v 1.21.34.1 2022/12/21 19:58:15 martin Exp $	*/
+/*	$NetBSD: ttycom.h,v 1.23 2024/10/30 15:56:12 riastradh Exp $	*/
 
 /*-
  * Copyright (c) 1982, 1986, 1990, 1993, 1994
@@ -59,6 +59,12 @@ struct winsize {
 };
 #endif /* !_POSIX_SYS_TTYCOM_H_ */
 
+#include <sys/featuretest.h>
+
+/*
+ * XXX This is revolting -- should not depend on order of includes via
+ * _SYS_IOCTL_H_.
+ */
 #if defined(_NETBSD_SOURCE) || defined(_SYS_IOCTL_H_)
 
 #ifndef	_NETBSD_SYS_TTYCOM_H_

package/libc/include/generic-netbsd/sys/types.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: types.h,v 1.105.20.1 2023/05/15 10:34:58 martin Exp $	*/
+/*	$NetBSD: types.h,v 1.106 2023/01/13 18:43:42 martin Exp $	*/
 
 /*-
  * Copyright (c) 1982, 1986, 1991, 1993, 1994