[PATCH 2/2] conform: Add initial support for XOPEN2K24

Collin Funk collin.funk1@gmail.com
Thu Feb 26 04:00:27 GMT 2026


Make XOPEN2K24 checks the same as XOPEN2K8 using the following command:

    $ find conform -name '*.h-data' | xargs sed -i \
        -e 's| !defined XOPEN2K8| !defined XOPEN2K8 \&\& !defined XOPEN2K24|g' \
        -e 's| defined XOPEN2K8| defined XOPEN2K8 \|\| defined XOPEN2K24|g' \
        -e 's|ifdef XOPEN2K8|if defined XOPEN2K8 \|\| defined XOPEN2K24|g' \
        -e 's|ifndef XOPEN2K8|if !defined XOPEN2K8 \&\& !defined XOPEN2K24|g'
---
 conform/data/ctype.h-data       |  2 +-
 conform/data/dirent.h-data      |  2 +-
 conform/data/errno.h-data       |  2 +-
 conform/data/fcntl.h-data       |  8 ++++----
 conform/data/fnmatch.h-data     |  2 +-
 conform/data/glob.h-data        |  2 +-
 conform/data/grp.h-data         |  2 +-
 conform/data/iconv.h-data       |  2 +-
 conform/data/langinfo.h-data    |  4 ++--
 conform/data/limits.h-data      |  4 ++--
 conform/data/locale.h-data      |  6 +++---
 conform/data/monetary.h-data    |  4 ++--
 conform/data/mqueue.h-data      |  4 ++--
 conform/data/netdb.h-data       |  2 +-
 conform/data/netinet/tcp.h-data |  2 +-
 conform/data/pthread.h-data     |  6 +++---
 conform/data/pwd.h-data         |  2 +-
 conform/data/regex.h-data       |  2 +-
 conform/data/sched.h-data       |  2 +-
 conform/data/semaphore.h-data   |  2 +-
 conform/data/signal.h-data      | 10 +++++-----
 conform/data/spawn.h-data       |  2 +-
 conform/data/stdarg.h-data      |  2 +-
 conform/data/stdio.h-data       | 32 ++++++++++++++++----------------
 conform/data/stdlib.h-data      | 12 ++++++------
 conform/data/string.h-data      | 18 +++++++++---------
 conform/data/strings.h-data     |  6 +++---
 conform/data/sys/select.h-data  |  2 +-
 conform/data/sys/socket.h-data  |  4 ++--
 conform/data/sys/stat.h-data    | 18 +++++++++---------
 conform/data/sys/timeb.h-data   |  2 +-
 conform/data/sys/wait.h-data    |  4 ++--
 conform/data/termios.h-data     |  8 ++++----
 conform/data/time.h-data        |  6 +++---
 conform/data/ucontext.h-data    |  2 +-
 conform/data/unistd.h-data      | 28 ++++++++++++++--------------
 conform/data/wchar.h-data       | 20 ++++++++++----------
 conform/data/wctype.h-data      |  4 ++--
 conform/data/wordexp.h-data     |  2 +-
 39 files changed, 122 insertions(+), 122 deletions(-)

diff --git a/conform/data/ctype.h-data b/conform/data/ctype.h-data
index 6d3541c166..29782112cb 100644
--- a/conform/data/ctype.h-data
+++ b/conform/data/ctype.h-data
@@ -25,7 +25,7 @@ function int _toupper (int)
 function int _tolower (int)
 #endif
 
-# if defined XOPEN2K8 || defined POSIX2008 || defined POSIX2024
+# if defined XOPEN2K8 || defined XOPEN2K24 || defined POSIX2008 || defined POSIX2024
 type locale_t
 
 function int isalnum_l (int, locale_t)
diff --git a/conform/data/dirent.h-data b/conform/data/dirent.h-data
index 0b9cb28a03..c3bcbc4e37 100644
--- a/conform/data/dirent.h-data
+++ b/conform/data/dirent.h-data
@@ -25,7 +25,7 @@ function {long int} telldir (DIR*)
 allow d_*
 allow *_t
 
-# if defined XOPEN2K8 || defined POSIX2008 || defined POSIX2024
+# if defined XOPEN2K8 || defined XOPEN2K24 || defined POSIX2008 || defined POSIX2024
 function int alphasort (const struct dirent**, const struct dirent**)
 function int dirfd (DIR*)
 function int scandir (const char*, struct dirent***, int(*)(const struct dirent*), int(*)(const struct dirent**,const struct dirent **))
diff --git a/conform/data/errno.h-data b/conform/data/errno.h-data
index a32a2e926d..b9b5184378 100644
--- a/conform/data/errno.h-data
+++ b/conform/data/errno.h-data
@@ -122,7 +122,7 @@ macro-int-constant EWOULDBLOCK {int} > 0
 # endif
 macro-int-constant EXDEV {int} > 0
 
-# if defined XOPEN2K8 || defined POSIX2008 || defined POSIX2024
+# if defined XOPEN2K8 || defined XOPEN2K24 || defined POSIX2008 || defined POSIX2024
 macro-int-constant ENOTRECOVERABLE {int} > 0
 macro-int-constant EOWNERDEAD {int} > 0
 # endif
diff --git a/conform/data/fcntl.h-data b/conform/data/fcntl.h-data
index ad5686999d..1593a61029 100644
--- a/conform/data/fcntl.h-data
+++ b/conform/data/fcntl.h-data
@@ -67,7 +67,7 @@ constant S_ISVTX
 #endif
 #endif
 
-#if defined XOPEN2K || defined XOPEN2K8 || defined POSIX2008 || defined POSIX2024
+#if defined XOPEN2K || defined XOPEN2K8 || defined XOPEN2K24 || defined POSIX2008 || defined POSIX2024
 constant POSIX_FADV_NORMAL
 constant POSIX_FADV_SEQUENTIAL
 constant POSIX_FADV_RANDOM
@@ -96,15 +96,15 @@ type pid_t
 function int creat (const char*, mode_t)
 function int fcntl (int, int, ...)
 function int open (const char*, int, ...)
-#if defined XOPEN2K8 || defined POSIX2008 || defined POSIX2024
+#if defined XOPEN2K8 || defined XOPEN2K24 || defined POSIX2008 || defined POSIX2024
 function int openat (int, const char*, int, ...)
 #endif
-#if defined XOPEN2K || defined XOPEN2K8 || defined POSIX2008 || defined POSIX2024
+#if defined XOPEN2K || defined XOPEN2K8 || defined XOPEN2K24 || defined POSIX2008 || defined POSIX2024
 function int posix_fadvise (int, off_t, off_t, int)
 function int posix_fallocate (int, off_t, off_t)
 #endif
 
-#if defined XOPEN2K8 || defined POSIX2008 || defined POSIX2024
+#if defined XOPEN2K8 || defined XOPEN2K24 || defined POSIX2008 || defined POSIX2024
 // Bug 18228: O_TTY_INIT, O_EXEC, O_SEARCH missing.
 xfail-constant O_TTY_INIT
 constant O_CLOEXEC
diff --git a/conform/data/fnmatch.h-data b/conform/data/fnmatch.h-data
index 1b0bffc5a6..341bfda5b7 100644
--- a/conform/data/fnmatch.h-data
+++ b/conform/data/fnmatch.h-data
@@ -3,7 +3,7 @@ constant FNM_NOMATCH
 constant FNM_PATHNAME
 constant FNM_PERIOD
 constant FNM_NOESCAPE
-#if !defined POSIX && !defined XOPEN2K8 && !defined POSIX2008 && !defined POSIX2024
+#if !defined POSIX && !defined XOPEN2K8 && !defined XOPEN2K24 && !defined POSIX2008 && !defined POSIX2024
 constant FNM_NOSYS
 #endif
 
diff --git a/conform/data/glob.h-data b/conform/data/glob.h-data
index 44ea3b6910..886364f20d 100644
--- a/conform/data/glob.h-data
+++ b/conform/data/glob.h-data
@@ -19,7 +19,7 @@ constant GLOB_NOSORT
 constant GLOB_ABORTED
 constant GLOB_NOMATCH
 constant GLOB_NOSPACE
-# if !defined XOPEN2K8 && !defined POSIX2008 && !defined POSIX2024 && !defined POSIX
+# if !defined XOPEN2K8 && !defined XOPEN2K24 && !defined POSIX2008 && !defined POSIX2024 && !defined POSIX
 constant GLOB_NOSYS
 # endif
 
diff --git a/conform/data/grp.h-data b/conform/data/grp.h-data
index 0bd182eae8..1c951959f1 100644
--- a/conform/data/grp.h-data
+++ b/conform/data/grp.h-data
@@ -11,7 +11,7 @@ element {struct group} {char**} gr_mem
 # ifndef POSIX
 type gid_t
 # endif
-# if defined XOPEN2K8 || defined POSIX2008 || defined POSIX2024
+# if defined XOPEN2K8 || defined XOPEN2K24 || defined POSIX2008 || defined POSIX2024
 type size_t
 # endif
 
diff --git a/conform/data/iconv.h-data b/conform/data/iconv.h-data
index 7f54e14c31..d95b358a06 100644
--- a/conform/data/iconv.h-data
+++ b/conform/data/iconv.h-data
@@ -1,6 +1,6 @@
 #if !defined ISO && !defined ISO99 && !defined ISO11 && !defined ISO23 && !defined POSIX
 type iconv_t
-# if defined XOPEN2K8 || defined POSIX2008 || defined POSIX2024
+# if defined XOPEN2K8 || defined XOPEN2K24 || defined POSIX2008 || defined POSIX2024
 type size_t
 # endif
 
diff --git a/conform/data/langinfo.h-data b/conform/data/langinfo.h-data
index 4fbffb3629..6f24f035ae 100644
--- a/conform/data/langinfo.h-data
+++ b/conform/data/langinfo.h-data
@@ -61,12 +61,12 @@ constant NOSTR
 # endif
 
 type nl_item
-# if defined XOPEN2K8 || defined POSIX2008 || defined POSIX2024
+# if defined XOPEN2K8 || defined XOPEN2K24 || defined POSIX2008 || defined POSIX2024
 type locale_t
 # endif
 
 function {char*} nl_langinfo (nl_item)
-# if defined XOPEN2K8 || defined POSIX2008 || defined POSIX2024
+# if defined XOPEN2K8 || defined XOPEN2K24 || defined POSIX2008 || defined POSIX2024
 function {char*} nl_langinfo_l (nl_item, locale_t)
 # endif
 
diff --git a/conform/data/limits.h-data b/conform/data/limits.h-data
index b770007b15..95202cb386 100644
--- a/conform/data/limits.h-data
+++ b/conform/data/limits.h-data
@@ -20,7 +20,7 @@ macro-int-constant UINT_MAX {unsigned int} >= 4294967295U
 macro-int-constant LONG_MAX {long int} >= 2147483647L
 macro-int-constant LONG_MIN {long int} <= -2147483647L
 macro-int-constant ULONG_MAX {unsigned long int} >= 4294967295UL
-#if defined ISO99 || defined ISO11 || defined ISO23 || defined XOPEN2K8 || defined POSIX2008 || defined POSIX2024
+#if defined ISO99 || defined ISO11 || defined ISO23 || defined XOPEN2K8 || defined XOPEN2K24 || defined POSIX2008 || defined POSIX2024
 macro-int-constant LLONG_MIN {long long int} <= -9223372036854775807ll
 macro-int-constant LLONG_MAX {long long int} >= 9223372036854775807ll
 macro-int-constant ULLONG_MAX {unsigned long long int} >= 18446744073709551615ull
@@ -179,7 +179,7 @@ optional-constant NL_ARGMAX >= 9
 optional-constant NL_LANGMAX >= 14
 # endif
 optional-constant NL_MSGMAX >= 32767
-# if !defined XOPEN2K8 && !defined POSIX2008 && !defined POSIX2024
+# if !defined XOPEN2K8 && !defined XOPEN2K24 && !defined POSIX2008 && !defined POSIX2024
 optional-constant NL_NMAX
 # endif
 optional-constant NL_SETMAX >= 255
diff --git a/conform/data/locale.h-data b/conform/data/locale.h-data
index 5ec4bb5feb..f12252429a 100644
--- a/conform/data/locale.h-data
+++ b/conform/data/locale.h-data
@@ -38,7 +38,7 @@ macro-int-constant LC_MONETARY
 macro-int-constant LC_NUMERIC
 macro-int-constant LC_TIME
 
-#if defined XOPEN2K8 || defined POSIX2008 || defined POSIX2024
+#if defined XOPEN2K8 || defined XOPEN2K24 || defined POSIX2008 || defined POSIX2024
 constant LC_GLOBAL_LOCALE
 
 macro LC_COLLATE_MASK
@@ -54,7 +54,7 @@ type locale_t
 
 function {struct lconv*} localeconv (void)
 function {char*} setlocale (int, const char*)
-#if defined XOPEN2K8 || defined POSIX2008 || defined POSIX2024
+#if defined XOPEN2K8 || defined XOPEN2K24 || defined POSIX2008 || defined POSIX2024
 function locale_t duplocale (locale_t)
 function void freelocale (locale_t)
 function locale_t newlocale (int, const char*, locale_t)
@@ -65,6 +65,6 @@ allow LC_[ABCDEFGHIJKLMNOPQRSTUVWXYZ]*
 #if !defined ISO && !defined ISO99 && !defined ISO11 && !defined ISO23
 allow *_t
 #endif
-#if defined XOPEN2K8 || defined POSIX2008 || defined POSIX2024
+#if defined XOPEN2K8 || defined XOPEN2K24 || defined POSIX2008 || defined POSIX2024
 allow LC_*_MASK
 #endif
diff --git a/conform/data/monetary.h-data b/conform/data/monetary.h-data
index 5a8487992f..12920747d6 100644
--- a/conform/data/monetary.h-data
+++ b/conform/data/monetary.h-data
@@ -1,12 +1,12 @@
 #if !defined ISO && !defined ISO99 && !defined ISO11 && !defined ISO23 && !defined POSIX
 type size_t
 type ssize_t
-# if defined XOPEN2K8 || defined POSIX2008 || defined POSIX2024
+# if defined XOPEN2K8 || defined XOPEN2K24 || defined POSIX2008 || defined POSIX2024
 type locale_t
 # endif
 
 function ssize_t strfmon (char*, size_t, const char*, ...)
-# if defined XOPEN2K8 || defined POSIX2008 || defined POSIX2024
+# if defined XOPEN2K8 || defined XOPEN2K24 || defined POSIX2008 || defined POSIX2024
 function ssize_t strfmon_l (char*, size_t, locale_t, const char*, ...)
 # endif
 
diff --git a/conform/data/mqueue.h-data b/conform/data/mqueue.h-data
index 8daa18b95d..f4e2a37077 100644
--- a/conform/data/mqueue.h-data
+++ b/conform/data/mqueue.h-data
@@ -24,12 +24,12 @@ function ssize_t mq_receive (mqd_t, char*, size_t, unsigned int*)
 function int mq_send (mqd_t, const char*, size_t, unsigned int)
 function int mq_setattr (mqd_t, const struct mq_attr*, struct mq_attr*)
 function int mq_unlink (const char*)
-#if defined XOPEN2K || defined XOPEN2K8 || defined POSIX2008 || defined POSIX2024
+#if defined XOPEN2K || defined XOPEN2K8 || defined XOPEN2K24 || defined POSIX2008 || defined POSIX2024
 optional-function ssize_t mq_timedreceive (mqd_t, char*, size_t, unsigned int*, const struct timespec*)
 optional-function int mq_timedsend (mqd_t, const char*, size_t, unsigned int, const struct timespec*)
 #endif
 
-#if defined XOPEN2K8 || defined POSIX2008 || defined POSIX2024
+#if defined XOPEN2K8 || defined XOPEN2K24 || defined POSIX2008 || defined POSIX2024
 type pthread_attr_t
 type size_t
 type ssize_t
diff --git a/conform/data/netdb.h-data b/conform/data/netdb.h-data
index 3e9d4c0ca0..17c629d6dc 100644
--- a/conform/data/netdb.h-data
+++ b/conform/data/netdb.h-data
@@ -35,7 +35,7 @@ element {struct servent} {char*} s_proto
 
 macro IPPORT_RESERVED
 
-#if !defined XOPEN2K8 && !defined POSIX2008 && !defined POSIX2024
+#if !defined XOPEN2K8 && !defined XOPEN2K24 && !defined POSIX2008 && !defined POSIX2024
 // variable int h_errno
 allow h_errno
 
diff --git a/conform/data/netinet/tcp.h-data b/conform/data/netinet/tcp.h-data
index dda83d2577..53cfe1ba56 100644
--- a/conform/data/netinet/tcp.h-data
+++ b/conform/data/netinet/tcp.h-data
@@ -1,4 +1,4 @@
-#if defined XOPEN2K || defined POSIX2008 || defined POSIX2024 || defined XOPEN2K8
+#if defined XOPEN2K || defined POSIX2008 || defined POSIX2024 || defined XOPEN2K8 || defined XOPEN2K24
 macro TCP_NODELAY
 
 allow TCP_*
diff --git a/conform/data/pthread.h-data b/conform/data/pthread.h-data
index bf78019d1a..89a5cd3829 100644
--- a/conform/data/pthread.h-data
+++ b/conform/data/pthread.h-data
@@ -25,7 +25,7 @@ constant PTHREAD_MUTEX_NORMAL
 constant PTHREAD_MUTEX_RECURSIVE
 macro PTHREAD_RWLOCK_INITIALIZER
 # endif
-# if defined XOPEN2K8 || defined POSIX2008 || defined POSIX2024
+# if defined XOPEN2K8 || defined XOPEN2K24 || defined POSIX2008 || defined POSIX2024
 constant PTHREAD_MUTEX_ROBUST
 constant PTHREAD_MUTEX_STALLED
 # endif
@@ -169,7 +169,7 @@ function int pthread_setconcurrency (int)
 # endif
 function int pthread_setschedparam (pthread_t, int, const struct sched_param*)
 function int pthread_setspecific (pthread_key_t, const void*)
-# if !defined POSIX && !defined UNIX98 && !defined XOPEN2K && !defined XOPEN2K8 && !defined POSIX2008 && !defined POSIX2024
+# if !defined POSIX && !defined UNIX98 && !defined XOPEN2K && !defined XOPEN2K8 && !defined XOPEN2K24 && !defined POSIX2008 && !defined POSIX2024
 function int pthread_sigmask (int, const sigset_t*, sigset_t*)
 # endif
 # if !defined POSIX && !defined UNIX98
@@ -180,7 +180,7 @@ function int pthread_spin_trylock (pthread_spinlock_t*)
 function int pthread_spin_unlock (pthread_spinlock_t*)
 # endif
 function void pthread_testcancel (void)
-# if defined XOPEN2K8 || defined POSIX2008 || defined POSIX2024
+# if defined XOPEN2K8 || defined XOPEN2K24 || defined POSIX2008 || defined POSIX2024
 function int pthread_mutex_consistent (pthread_mutex_t *)
 function int pthread_mutexattr_getrobust (const pthread_mutexattr_t*, int*)
 function int pthread_mutexattr_setrobust (pthread_mutexattr_t*, int)
diff --git a/conform/data/pwd.h-data b/conform/data/pwd.h-data
index 81f7b23b97..d00a4e82fc 100644
--- a/conform/data/pwd.h-data
+++ b/conform/data/pwd.h-data
@@ -14,7 +14,7 @@ element {struct passwd} {char*} pw_shell
 # ifndef POSIX
 type uid_t
 type gid_t
-#  if defined XOPEN2K8 || defined POSIX2008 || defined POSIX2024
+#  if defined XOPEN2K8 || defined XOPEN2K24 || defined POSIX2008 || defined POSIX2024
 type size_t
 #  endif
 # endif
diff --git a/conform/data/regex.h-data b/conform/data/regex.h-data
index c8e70583b0..5997079e82 100644
--- a/conform/data/regex.h-data
+++ b/conform/data/regex.h-data
@@ -29,7 +29,7 @@ constant REG_BADBR
 constant REG_ERANGE
 constant REG_ESPACE
 constant REG_BADRPT
-# if !defined POSIX && !defined XOPEN2K8 && !defined POSIX2008 && !defined POSIX2024
+# if !defined POSIX && !defined XOPEN2K8 && !defined XOPEN2K24 && !defined POSIX2008 && !defined POSIX2024
 constant REG_ENOSYS
 # endif
 
diff --git a/conform/data/sched.h-data b/conform/data/sched.h-data
index 3cddfafae7..f03694df52 100644
--- a/conform/data/sched.h-data
+++ b/conform/data/sched.h-data
@@ -14,7 +14,7 @@ optional-element {struct sched_param} {struct timespec} sched_ss_init_budget
 optional-element {struct sched_param} int sched_ss_max_repl
 # endif
 
-# if defined XOPEN2K8 || defined POSIX2008 || defined POSIX2024
+# if defined XOPEN2K8 || defined XOPEN2K24 || defined POSIX2008 || defined POSIX2024
 type pid_t
 type time_t
 type {struct timespec}
diff --git a/conform/data/semaphore.h-data b/conform/data/semaphore.h-data
index 001c4c4457..ecfc2cba76 100644
--- a/conform/data/semaphore.h-data
+++ b/conform/data/semaphore.h-data
@@ -17,7 +17,7 @@ function int sem_unlink (const char*)
 function int sem_wait (sem_t*)
 
 allow-header fcntl.h
-# if !defined POSIX2008 && !defined POSIX2024 && !defined XOPEN2K8
+# if !defined POSIX2008 && !defined POSIX2024 && !defined XOPEN2K8 && !defined XOPEN2K24
 allow-header sys/types.h
 # endif
 // Consider addition of this permission in POSIX.1:2008 as a bug fix,
diff --git a/conform/data/signal.h-data b/conform/data/signal.h-data
index e22e8f5593..421fb6cb19 100644
--- a/conform/data/signal.h-data
+++ b/conform/data/signal.h-data
@@ -15,7 +15,7 @@ type pid_t
 # define pid_t __pid_t
 # define uid_t __uid_t
 #endif
-#if defined XOPEN2K8 || defined POSIX2008 || defined POSIX2024
+#if defined XOPEN2K8 || defined XOPEN2K24 || defined POSIX2008 || defined POSIX2024
 type size_t
 type pthread_t
 type uid_t
@@ -35,7 +35,7 @@ element {struct timespec} __time_t tv_sec
 xfail[x86_64-x32-linux]-element {struct timespec} long tv_nsec
 #endif
 
-#if defined POSIX || defined UNIX98 || defined XOPEN2K || defined XOPEN2K8 || defined POSIX2008 || defined POSIX2024
+#if defined POSIX || defined UNIX98 || defined XOPEN2K || defined XOPEN2K8 || defined XOPEN2K24 || defined POSIX2008 || defined POSIX2024
 element {union sigval} int sival_int
 element {union sigval} {void*} sival_ptr
 
@@ -148,7 +148,7 @@ element stack_t {void*} ss_sp
 element stack_t size_t ss_size
 element stack_t int ss_flags
 
-#  if !defined XOPEN2K8 && !defined POSIX2008 && !defined POSIX2024
+#  if !defined XOPEN2K8 && !defined XOPEN2K24 && !defined POSIX2008 && !defined POSIX2024
 type {struct sigstack}
 
 element {struct sigstack} int ss_onstack
@@ -224,7 +224,7 @@ constant SI_ASYNCIO
 constant SI_MESGQ
 # endif
 
-# if !defined XPG4 && !defined XOPEN2K8 && !defined POSIX && !defined POSIX2008 && !defined POSIX2024
+# if !defined XPG4 && !defined XOPEN2K8 && !defined XOPEN2K24 && !defined POSIX && !defined POSIX2008 && !defined POSIX2024
 function void (*bsd_signal (int, void(*)(int)))(int)
 # endif
 function int kill (pid_t, int)
@@ -272,7 +272,7 @@ function int sigtimedwait (const sigset_t*, siginfo_t*, const struct timespec*)
 function int sigwait (const sigset_t*, int*)
 function int sigwaitinfo (const sigset_t*, siginfo_t*)
 # endif
-# if defined XOPEN2K8 || defined POSIX2008 || defined POSIX2024
+# if defined XOPEN2K8 || defined XOPEN2K24 || defined POSIX2008 || defined POSIX2024
 function void psiginfo (const siginfo_t*, const char*)
 function void psignal (int, const char*)
 # endif
diff --git a/conform/data/spawn.h-data b/conform/data/spawn.h-data
index 4d49ad1faa..43aa9cb8ae 100644
--- a/conform/data/spawn.h-data
+++ b/conform/data/spawn.h-data
@@ -1,7 +1,7 @@
 #if !defined ISO && !defined ISO99 && !defined ISO11 && !defined ISO23 && !defined POSIX && !defined XPG4 && !defined XPG42 && !defined UNIX98
 type posix_spawnattr_t
 type posix_spawn_file_actions_t
-# if defined XOPEN2K8 || defined POSIX2008 || defined POSIX2024
+# if defined XOPEN2K8 || defined XOPEN2K24 || defined POSIX2008 || defined POSIX2024
 type mode_t
 type pid_t
 type sigset_t
diff --git a/conform/data/stdarg.h-data b/conform/data/stdarg.h-data
index ce5de8f6fc..fa97249ba2 100644
--- a/conform/data/stdarg.h-data
+++ b/conform/data/stdarg.h-data
@@ -5,7 +5,7 @@ macro va_start
 macro va_arg
 macro va_end
 
-#if defined ISO99 || defined ISO11 || defined ISO23 || defined XOPEN2K || defined POSIX2008 || defined POSIX2024 || defined XOPEN2K8
+#if defined ISO99 || defined ISO11 || defined ISO23 || defined XOPEN2K || defined POSIX2008 || defined POSIX2024 || defined XOPEN2K8 || defined XOPEN2K24
 macro va_copy
 #endif
 
diff --git a/conform/data/stdio.h-data b/conform/data/stdio.h-data
index 736a631750..df4d8ab364 100644
--- a/conform/data/stdio.h-data
+++ b/conform/data/stdio.h-data
@@ -8,7 +8,7 @@ macro-int-constant _IONBF
 
 #if !defined ISO && !defined ISO99 && !defined ISO11 && !defined ISO23
 constant L_ctermid
-# if !defined XOPEN2K && !defined XOPEN2K8 && !defined POSIX2008 && !defined POSIX2024
+# if !defined XOPEN2K && !defined XOPEN2K8 && !defined XOPEN2K24 && !defined POSIX2008 && !defined POSIX2024
 #  ifdef POSIX
 optional-constant L_cuserid
 #  else
@@ -44,7 +44,7 @@ type va_list
 #define va_list __gnuc_va_list
 #endif
 type size_t
-#if defined XOPEN2K8 || defined POSIX2008 || defined POSIX2024
+#if defined XOPEN2K8 || defined XOPEN2K24 || defined POSIX2008 || defined POSIX2024
 type off_t
 type ssize_t
 #endif
@@ -56,7 +56,7 @@ function {char*} ctermid (char*)
 function {char*} cuserid (char*)
 # endif
 #endif
-#if defined XOPEN2K8 || defined POSIX2008 || defined POSIX2024
+#if defined XOPEN2K8 || defined XOPEN2K24 || defined POSIX2008 || defined POSIX2024
 function int dprintf (int, const char*, ...)
 #endif
 function int fclose (FILE*)
@@ -72,10 +72,10 @@ function {char*} fgets (char*, int, FILE*)
 #if !defined ISO && !defined ISO99 && !defined ISO11 && !defined ISO23
 function int fileno (FILE*)
 #endif
-#if defined POSIX || defined UNIX98 || defined XOPEN2K || defined XOPEN2K8 || defined POSIX2008 || defined POSIX2024
+#if defined POSIX || defined UNIX98 || defined XOPEN2K || defined XOPEN2K8 || defined XOPEN2K24 || defined POSIX2008 || defined POSIX2024
 function void flockfile (FILE*)
 #endif
-#if defined XOPEN2K8 || defined POSIX2008 || defined POSIX2024
+#if defined XOPEN2K8 || defined XOPEN2K24 || defined POSIX2008 || defined POSIX2024
 function {FILE*} fmemopen (void*, size_t, const char*)
 #endif
 function {FILE*} fopen (const char*, const char*)
@@ -86,26 +86,26 @@ function size_t fread (void*, size_t, size_t, FILE*)
 function {FILE*} freopen (const char*, const char*, FILE*)
 function int fscanf (FILE*, const char*, ...)
 function int fseek (FILE*, long int, int)
-#if defined UNIX98 || defined XOPEN2K || defined XOPEN2K8 || defined POSIX2008 || defined POSIX2024
+#if defined UNIX98 || defined XOPEN2K || defined XOPEN2K8 || defined XOPEN2K24 || defined POSIX2008 || defined POSIX2024
 function int fseeko (FILE*, off_t, int)
 #endif
 function int fsetpos (FILE*, const fpos_t*)
 function {long int} ftell (FILE*)
-#if defined UNIX98 || defined XOPEN2K || defined XOPEN2K8 || defined POSIX2008 || defined POSIX2024
+#if defined UNIX98 || defined XOPEN2K || defined XOPEN2K8 || defined XOPEN2K24 || defined POSIX2008 || defined POSIX2024
 function off_t ftello (FILE*)
 #endif
-#if defined POSIX || defined UNIX98 || defined XOPEN2K || defined XOPEN2K8 || defined POSIX2008 || defined POSIX2024
+#if defined POSIX || defined UNIX98 || defined XOPEN2K || defined XOPEN2K8 || defined XOPEN2K24 || defined POSIX2008 || defined POSIX2024
 function int ftrylockfile (FILE*)
 function void funlockfile (FILE*)
 #endif
 function size_t fwrite (const void*, size_t, size_t, FILE*)
 function int getc (FILE*)
 function int getchar (void)
-#if defined POSIX || defined UNIX98 || defined XOPEN2K || defined XOPEN2K8 || defined POSIX2008 || defined POSIX2024
+#if defined POSIX || defined UNIX98 || defined XOPEN2K || defined XOPEN2K8 || defined XOPEN2K24 || defined POSIX2008 || defined POSIX2024
 function int getc_unlocked (FILE*)
 function int getchar_unlocked (void)
 #endif
-#if defined XOPEN2K8 || defined POSIX2008 || defined POSIX2024
+#if defined XOPEN2K8 || defined XOPEN2K24 || defined POSIX2008 || defined POSIX2024
 function ssize_t getdelim (char**, size_t*, int, FILE*)
 function ssize_t getline (char**, size_t*, FILE*)
 #endif
@@ -118,7 +118,7 @@ function {char*} gets (char*)
 #if defined XPG4 || defined XPG42 || defined UNIX98
 function int getw (FILE*)
 #endif
-#if defined XOPEN2K8 || defined POSIX2008 || defined POSIX2024
+#if defined XOPEN2K8 || defined XOPEN2K24 || defined POSIX2008 || defined POSIX2024
 function {FILE*} open_memstream (char**, size_t*)
 #endif
 #if !defined ISO && !defined ISO99 && !defined ISO11 && !defined ISO23
@@ -131,7 +131,7 @@ function {FILE*} popen (const char*, const char*)
 function int printf (const char*, ...)
 function int putc (int, FILE*)
 function int putchar (int)
-#if defined POSIX || defined UNIX98 || defined XOPEN2K || defined XOPEN2K8 || defined POSIX2008 || defined POSIX2024
+#if defined POSIX || defined UNIX98 || defined XOPEN2K || defined XOPEN2K8 || defined XOPEN2K24 || defined POSIX2008 || defined POSIX2024
 function int putc_unlocked (int, FILE*)
 function int putchar_unlocked (int)
 #endif
@@ -141,7 +141,7 @@ function int putw (int, FILE*)
 #endif
 function int remove (const char*)
 function int rename (const char*, const char*)
-#if defined XOPEN2K8 || defined POSIX2008 || defined POSIX2024
+#if defined XOPEN2K8 || defined XOPEN2K24 || defined POSIX2008 || defined POSIX2024
 function int renameat (int, const char*, int, const char*)
 #endif
 function void rewind (FILE*)
@@ -153,13 +153,13 @@ function int snprintf (char*, size_t, const char*, ...)
 #endif
 function int sprintf (char *, const char *, ...)
 function int sscanf (const char*, const char*, ...)
-#if defined XPG4 || defined XPG42 || defined UNIX98 || defined XOPEN2K || defined XOPEN2K8
+#if defined XPG4 || defined XPG42 || defined UNIX98 || defined XOPEN2K || defined XOPEN2K8 || defined XOPEN2K24
 function {char*} tempnam (const char*, const char*)
 #endif
 function {FILE*} tmpfile (void)
 function {char*} tmpnam (char*)
 function int ungetc (int, FILE*)
-#if defined XOPEN2K8 || defined POSIX2008 || defined POSIX2024
+#if defined XOPEN2K8 || defined XOPEN2K24 || defined POSIX2008 || defined POSIX2024
 function int vdprintf (int, const char*, va_list)
 #endif
 function int vfprintf (FILE*, const char*, va_list)
@@ -179,7 +179,7 @@ function int vsscanf (const char*, const char*, va_list)
 #endif
 
 #if !defined ISO && !defined ISO99 && !defined ISO11 && !defined ISO23
-#if !defined POSIX && !defined XOPEN2K && !defined XOPEN2K8 && !defined POSIX2008 && !defined POSIX2024
+#if !defined POSIX && !defined XOPEN2K && !defined XOPEN2K8 && !defined XOPEN2K24 && !defined POSIX2008 && !defined POSIX2024
 variable {char*} optarg
 variable int opterr
 variable int optind
diff --git a/conform/data/stdlib.h-data b/conform/data/stdlib.h-data
index 64014de7ee..3132a876f5 100644
--- a/conform/data/stdlib.h-data
+++ b/conform/data/stdlib.h-data
@@ -12,7 +12,7 @@ macro-constant NULL == 0
 macro-int-constant RAND_MAX >= 32767
 macro MB_CUR_MAX
 
-#if defined ISO99 || defined ISO11 || defined ISO23 || defined XOPEN2K || defined XOPEN2K8 || defined POSIX2008 || defined POSIX2024
+#if defined ISO99 || defined ISO11 || defined ISO23 || defined XOPEN2K || defined XOPEN2K8 || defined XOPEN2K24 || defined POSIX2008 || defined POSIX2024
 type lldiv_t
 element lldiv_t {long long} quot
 element lldiv_t {long long} rem
@@ -103,10 +103,10 @@ function {void*} malloc (size_t)
 function int mblen (const char*, size_t)
 function size_t mbstowcs (wchar_t*, const char*, size_t)
 function int mbtowc (wchar_t*, const char*, size_t)
-#if defined XOPEN2K8 || defined POSIX2008 || defined POSIX2024
+#if defined XOPEN2K8 || defined XOPEN2K24 || defined POSIX2008 || defined POSIX2024
 function {char*} mkdtemp (char*)
 #endif
-#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined ISO23 && !defined XPG4 && !defined POSIX && !defined XOPEN2K8 && !defined POSIX2008 && !defined POSIX2024
+#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined ISO23 && !defined XPG4 && !defined POSIX && !defined XOPEN2K8 && !defined XOPEN2K24 && !defined POSIX2008 && !defined POSIX2024
 function {char*} mktemp (char*)
 #endif
 #if !defined ISO && !defined ISO99 && !defined ISO11 && !defined ISO23 && !defined XPG4 && !defined POSIX
@@ -116,10 +116,10 @@ function int mkstemp (char*)
 function {long int} mrand48 (void)
 function {long int} nrand48 (unsigned short int[3])
 #endif
-#if defined XOPEN2K || defined XOPEN2K8 || defined POSIX2008 || defined POSIX2024
+#if defined XOPEN2K || defined XOPEN2K8 || defined XOPEN2K24 || defined POSIX2008 || defined POSIX2024
 function int posix_memalign (void**, size_t, size_t)
 #endif
-#if defined XOPEN2K || defined XOPEN2K8
+#if defined XOPEN2K || defined XOPEN2K8 || defined XOPEN2K24
 function int posix_openpt (int)
 #endif
 #if !defined ISO && !defined ISO99 && !defined ISO11 && !defined ISO23 && !defined XPG4 && !defined POSIX && !defined POSIX2008 && !defined POSIX2024
@@ -133,7 +133,7 @@ function void qsort (void*, size_t, size_t, int(*)(const void*, const void*))
 function void quick_exit (int)
 #endif
 function int rand (void)
-#if defined POSIX || defined UNIX98 || defined XOPEN2K || defined XOPEN2K8 || defined POSIX2008 || defined POSIX2024
+#if defined POSIX || defined UNIX98 || defined XOPEN2K || defined XOPEN2K8 || defined XOPEN2K24 || defined POSIX2008 || defined POSIX2024
 function int rand_r (unsigned int*)
 #endif
 #if !defined ISO && !defined ISO99 && !defined ISO11 && !defined ISO23 && !defined XPG4 && !defined POSIX && !defined POSIX2008 && !defined POSIX2024
diff --git a/conform/data/string.h-data b/conform/data/string.h-data
index 0ce1ba5f0a..abc6b12b5d 100644
--- a/conform/data/string.h-data
+++ b/conform/data/string.h-data
@@ -1,7 +1,7 @@
 macro-constant NULL == 0
 
 type size_t
-#if defined XOPEN2K8 || defined POSIX2008 || defined POSIX2024
+#if defined XOPEN2K8 || defined XOPEN2K24 || defined POSIX2008 || defined POSIX2024
 type locale_t
 #endif
 
@@ -13,7 +13,7 @@ function int memcmp (const void*, const void*, size_t)
 function {void*} memcpy (void*, const void*, size_t)
 function {void*} memmove (void*, const void*, size_t)
 function {void*} memset (void*, int, size_t)
-#if defined XOPEN2K8 || defined POSIX2008 || defined POSIX2024
+#if defined XOPEN2K8 || defined XOPEN2K24 || defined POSIX2008 || defined POSIX2024
 function {char*} stpcpy (char*, const char*)
 function {char*} stpncpy (char*, const char*, size_t)
 
@@ -22,7 +22,7 @@ function {char*} strcat (char*, const char*)
 function {char*} strchr (const char*, int)
 function int strcmp (const char*, const char*)
 function int strcoll (const char*, const char*)
-#if defined XOPEN2K8 || defined POSIX2008 || defined POSIX2024
+#if defined XOPEN2K8 || defined XOPEN2K24 || defined POSIX2008 || defined POSIX2024
 function int strcoll_l (const char*, const char*, locale_t)
 #endif
 function {char*} strcpy (char*, const char*)
@@ -31,33 +31,33 @@ function size_t strcspn (const char*, const char*)
 function {char*} strdup (const char*)
 #endif
 function {char*} strerror (int)
-#if defined XOPEN2K || defined XOPEN2K8 || defined POSIX2008 || defined POSIX2024
+#if defined XOPEN2K || defined XOPEN2K8 || defined XOPEN2K24 || defined POSIX2008 || defined POSIX2024
 function int strerror_r (int, char*, size_t)
 #endif
-#if defined XOPEN2K8 || defined POSIX2008 || defined POSIX2024
+#if defined XOPEN2K8 || defined XOPEN2K24 || defined POSIX2008 || defined POSIX2024
 function {char*} strerror_l (int, locale_t)
 #endif
 function size_t strlen (const char*)
 function {char*} strncat (char*, const char*, size_t)
 function int strncmp (const char*, const char*, size_t)
 function {char*} strncpy (char*, const char*, size_t)
-#if defined XOPEN2K8 || defined POSIX2008 || defined POSIX2024
+#if defined XOPEN2K8 || defined XOPEN2K24 || defined POSIX2008 || defined POSIX2024
 function {char*} strndup (const char*, size_t)
 function size_t strnlen (const char*, size_t)
 #endif
 function {char*} strpbrk (const char*, const char*)
 function {char*} strrchr (const char*, int)
-#if defined XOPEN2K8 || defined POSIX2008 || defined POSIX2024
+#if defined XOPEN2K8 || defined XOPEN2K24 || defined POSIX2008 || defined POSIX2024
 function {char*} strsignal (int)
 #endif
 function size_t strspn (const char*, const char*)
 function {char*} strstr (const char*, const char*)
 function {char*} strtok (char*, const char*)
-#if defined POSIX || defined UNIX98 || defined XOPEN2K || defined XOPEN2K8 || defined POSIX2008 || defined POSIX2024
+#if defined POSIX || defined UNIX98 || defined XOPEN2K || defined XOPEN2K8 || defined XOPEN2K24 || defined POSIX2008 || defined POSIX2024
 function {char*} strtok_r (char*, const char*, char**)
 #endif
 function size_t strxfrm (char*, const char*, size_t)
-#if defined XOPEN2K8 || defined POSIX2008 || defined POSIX2024
+#if defined XOPEN2K8 || defined XOPEN2K24 || defined POSIX2008 || defined POSIX2024
 function size_t strxfrm_l (char*, const char*, size_t, locale_t)
 #endif
 
diff --git a/conform/data/strings.h-data b/conform/data/strings.h-data
index 98aa38259e..c46d209a39 100644
--- a/conform/data/strings.h-data
+++ b/conform/data/strings.h-data
@@ -1,5 +1,5 @@
 #if !defined ISO && !defined ISO99 && !defined ISO11 && !defined ISO23 && !defined POSIX && !defined XPG4
-# if !defined XOPEN2K8 && !defined POSIX2008 && !defined POSIX2024
+# if !defined XOPEN2K8 && !defined XOPEN2K24 && !defined POSIX2008 && !defined POSIX2024
 function int bcmp (const void*, const void*, size_t)
 function void bcopy (const void*, void*, size_t)
 function void bzero (void*, size_t)
@@ -11,13 +11,13 @@ function int ffs (int)
 # endif
 function int strcasecmp (const char*, const char*)
 function int strncasecmp (const char*, const char*, size_t)
-# if defined XOPEN2K8 || defined POSIX2008 || defined POSIX2024
+# if defined XOPEN2K8 || defined XOPEN2K24 || defined POSIX2008 || defined POSIX2024
 function int strcasecmp_l (const char*, const char*, locale_t)
 function int strncasecmp_l (const char*, const char*, size_t, locale_t)
 # endif
 
 type size_t
-# if defined XOPEN2K8 || defined POSIX2008 || defined POSIX2024
+# if defined XOPEN2K8 || defined XOPEN2K24 || defined POSIX2008 || defined POSIX2024
 type locale_t
 # endif
 
diff --git a/conform/data/sys/select.h-data b/conform/data/sys/select.h-data
index c704792ddd..9905838127 100644
--- a/conform/data/sys/select.h-data
+++ b/conform/data/sys/select.h-data
@@ -25,7 +25,7 @@ macro FD_ZERO
 
 macro FD_SETSIZE
 
-#if defined XOPEN2K || defined POSIX2008 || defined POSIX2024 || defined XOPEN2K8
+#if defined XOPEN2K || defined POSIX2008 || defined POSIX2024 || defined XOPEN2K8 || defined XOPEN2K24
 function int pselect (int, fd_set*, fd_set*, fd_set*, const struct timespec*, const sigset_t*)
 #endif
 function int select (int, fd_set*, fd_set*, fd_set*, struct timeval*)
diff --git a/conform/data/sys/socket.h-data b/conform/data/sys/socket.h-data
index 7a1aba5772..65b47525ea 100644
--- a/conform/data/sys/socket.h-data
+++ b/conform/data/sys/socket.h-data
@@ -3,7 +3,7 @@ type socklen_t
 
 type sa_family_t
 
-# if defined XOPEN2K8 || defined POSIX2008 || defined POSIX2024
+# if defined XOPEN2K8 || defined XOPEN2K24 || defined POSIX2008 || defined POSIX2024
 type size_t
 type ssize_t
 # endif
@@ -83,7 +83,7 @@ macro MSG_OOB
 macro MSG_PEEK
 macro MSG_TRUNC
 macro MSG_WAITALL
-# if defined XOPEN2K8 || defined POSIX2008 || defined POSIX2024
+# if defined XOPEN2K8 || defined XOPEN2K24 || defined POSIX2008 || defined POSIX2024
 constant MSG_NOSIGNAL
 # endif
 
diff --git a/conform/data/sys/stat.h-data b/conform/data/sys/stat.h-data
index 9e62be9ba6..a5d13f5702 100644
--- a/conform/data/sys/stat.h-data
+++ b/conform/data/sys/stat.h-data
@@ -42,7 +42,7 @@ element {struct stat} off_t st_size
 element {struct stat} time_t st_atime
 element {struct stat} time_t st_mtime
 element {struct stat} time_t st_ctime
-#if defined XOPEN2K8 || defined POSIX2008 || defined POSIX2024
+#if defined XOPEN2K8 || defined XOPEN2K24 || defined POSIX2008 || defined POSIX2024
 element {struct stat} {struct timespec} st_atim
 element {struct stat} {struct timespec} st_mtim
 element {struct stat} {struct timespec} st_ctim
@@ -60,7 +60,7 @@ element {struct stat} blkcnt_t st_blocks
 # endif
 #endif
 
-# if defined XOPEN2K8 || defined POSIX2008 || defined POSIX2024
+# if defined XOPEN2K8 || defined XOPEN2K24 || defined POSIX2008 || defined POSIX2024
 type {struct timespec}
 element {struct timespec} time_t tv_sec
 // Bug 16437: tv_nsec has wrong type.
@@ -116,7 +116,7 @@ optional-macro S_TYPEISSHM
 optional-macro S_TYPEISTMO
 # endif
 
-# if defined XOPEN2K8 || defined POSIX2008 || defined POSIX2024
+# if defined XOPEN2K8 || defined XOPEN2K24 || defined POSIX2008 || defined POSIX2024
 constant UTIME_NOW
 constant UTIME_OMIT
 # endif
@@ -125,11 +125,11 @@ function int chmod (const char*, mode_t)
 # ifndef XPG4
 function int fchmod (int, mode_t)
 # endif
-# if defined XOPEN2K8 || defined POSIX2008 || defined POSIX2024
+# if defined XOPEN2K8 || defined XOPEN2K24 || defined POSIX2008 || defined POSIX2024
 function int fchmodat (int, const char*, mode_t, int)
 # endif
 function int fstat (int, struct stat*)
-# if defined XOPEN2K8 || defined POSIX2008 || defined POSIX2024
+# if defined XOPEN2K8 || defined XOPEN2K24 || defined POSIX2008 || defined POSIX2024
 function int fstatat (int, const char*, struct stat*, int)
 function int futimens (int, const struct timespec[2])
 # endif
@@ -137,22 +137,22 @@ function int futimens (int, const struct timespec[2])
 function int lstat (const char*, struct stat*)
 #endif
 function int mkdir (const char*, mode_t)
-# if defined XOPEN2K8 || defined POSIX2008 || defined POSIX2024
+# if defined XOPEN2K8 || defined XOPEN2K24 || defined POSIX2008 || defined POSIX2024
 function int mkdirat (int, const char*, mode_t)
 # endif
 function int mkfifo (const char*, mode_t)
-# if defined XOPEN2K8 || defined POSIX2008 || defined POSIX2024
+# if defined XOPEN2K8 || defined XOPEN2K24 || defined POSIX2008 || defined POSIX2024
 function int mkfifoat (int, const char*, mode_t)
 # endif
 # if !defined XPG4 && !defined POSIX && !defined POSIX2008 && !defined POSIX2024
 function int mknod (const char*, mode_t, dev_t)
 # endif
-# ifdef XOPEN2K8
+# if defined XOPEN2K8 || defined XOPEN2K24
 function int mknodat (int, const char*, mode_t, dev_t)
 # endif
 function int stat (const char*, struct stat*)
 function mode_t umask (mode_t)
-# if defined XOPEN2K8 || defined POSIX2008 || defined POSIX2024
+# if defined XOPEN2K8 || defined XOPEN2K24 || defined POSIX2008 || defined POSIX2024
 function int utimensat (int, const char*, const struct timespec[2], int)
 # endif
 
diff --git a/conform/data/sys/timeb.h-data b/conform/data/sys/timeb.h-data
index fdd723fd47..fe97b46996 100644
--- a/conform/data/sys/timeb.h-data
+++ b/conform/data/sys/timeb.h-data
@@ -1,4 +1,4 @@
-#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined ISO23 && !defined POSIX && !defined XPG4 && !defined POSIX2008 && !defined POSIX2024 && !defined XOPEN2K8
+#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined ISO23 && !defined POSIX && !defined XPG4 && !defined POSIX2008 && !defined POSIX2024 && !defined XOPEN2K8 && !defined XOPEN2K24
 type {struct timeb}
 
 element {struct timeb} time_t time
diff --git a/conform/data/sys/wait.h-data b/conform/data/sys/wait.h-data
index 8d1ea9306d..e7fe2687e3 100644
--- a/conform/data/sys/wait.h-data
+++ b/conform/data/sys/wait.h-data
@@ -51,7 +51,7 @@ element siginfo_t {union sigval} si_value
 # endif
 #endif
 
-#if !defined POSIX && !defined XPG4 && !defined XOPEN2K8 && !defined POSIX2008 && !defined POSIX2024
+#if !defined POSIX && !defined XPG4 && !defined XOPEN2K8 && !defined XOPEN2K24 && !defined POSIX2008 && !defined POSIX2024
 type {struct rusage}
 
 element {struct rusage} {struct timeval} ru_utime
@@ -63,7 +63,7 @@ type pid_t
 #endif
 
 function pid_t wait (int*)
-#if !defined XPG4 && !defined POSIX && !defined XOPEN2K && !defined XOPEN2K8 && !defined POSIX2008 && !defined POSIX2024
+#if !defined XPG4 && !defined POSIX && !defined XOPEN2K && !defined XOPEN2K8 && !defined XOPEN2K24 && !defined POSIX2008 && !defined POSIX2024
 function pid_t wait3 (int*, int, struct rusage*)
 #endif
 #if !defined XPG4 && !defined POSIX
diff --git a/conform/data/termios.h-data b/conform/data/termios.h-data
index f88ffd7ea7..ab138835b8 100644
--- a/conform/data/termios.h-data
+++ b/conform/data/termios.h-data
@@ -5,7 +5,7 @@ type tcflag_t
 
 type {struct termios}
 
-#if defined XOPEN2K8 || defined POSIX2008 || defined POSIX2024
+#if defined XOPEN2K8 || defined XOPEN2K24 || defined POSIX2008 || defined POSIX2024
 type pid_t
 #endif
 
@@ -37,7 +37,7 @@ constant IGNPAR
 constant INLCR
 constant INPCK
 constant ISTRIP
-# if !defined POSIX && !defined XOPEN2K && !defined XOPEN2K8 && !defined POSIX2008 && !defined POSIX2024
+# if !defined POSIX && !defined XOPEN2K && !defined XOPEN2K8 && !defined XOPEN2K24 && !defined POSIX2008 && !defined POSIX2024
 constant IUCLC
 # endif
 # ifndef POSIX
@@ -48,7 +48,7 @@ constant IXON
 constant PARMRK
 
 constant OPOST
-# if !defined POSIX && !defined XOPEN2K && !defined XOPEN2K8 && !defined POSIX2008 && !defined POSIX2024
+# if !defined POSIX && !defined XOPEN2K && !defined XOPEN2K8 && !defined XOPEN2K24 && !defined POSIX2008 && !defined POSIX2024
 constant OLCUC
 # endif
 # if !defined POSIX && !defined POSIX2008 && !defined POSIX2024
@@ -120,7 +120,7 @@ constant IEXTEN
 constant ISIG
 constant NOFLSH
 constant TOSTOP
-# if !defined POSIX && !defined XOPEN2K && !defined XOPEN2K8 && !defined POSIX2008 && !defined POSIX2024
+# if !defined POSIX && !defined XOPEN2K && !defined XOPEN2K8 && !defined XOPEN2K24 && !defined POSIX2008 && !defined POSIX2024
 constant XCASE
 # endif
 
diff --git a/conform/data/time.h-data b/conform/data/time.h-data
index 5a8ded52a8..c4b97e342e 100644
--- a/conform/data/time.h-data
+++ b/conform/data/time.h-data
@@ -43,7 +43,7 @@ function int timespec_get (struct timespec *, int)
 #endif
 
 #if !defined ISO && !defined ISO99 && !defined ISO11 && !defined ISO23
-# if !defined XOPEN2K && !defined XOPEN2K8 && !defined POSIX2008 && !defined POSIX2024
+# if !defined XOPEN2K && !defined XOPEN2K8 && !defined XOPEN2K24 && !defined POSIX2008 && !defined POSIX2024
 symbol CLK_TCK
 # endif
 # if !defined XPG4 && !defined XPG42
@@ -67,7 +67,7 @@ type clockid_t
 type timer_t
 # endif
 
-# if defined XOPEN2K8 || defined POSIX2008 || defined POSIX2024
+# if defined XOPEN2K8 || defined XOPEN2K24 || defined POSIX2008 || defined POSIX2024
 type pid_t
 type locale_t
 tag {struct sigevent}
@@ -100,7 +100,7 @@ function {struct tm*} localtime_r (const time_t*, struct tm*)
 # if !defined XPG4 && !defined XPG42
 function int nanosleep (const struct timespec*, struct timespec*)
 # endif
-# if defined XOPEN2K8 || defined POSIX2008 || defined POSIX2024
+# if defined XOPEN2K8 || defined XOPEN2K24 || defined POSIX2008 || defined POSIX2024
 function size_t strftime_l (char*, size_t, const char*, const struct tm*, locale_t)
 # endif
 # if !defined POSIX && !defined POSIX2008 && !defined POSIX2024
diff --git a/conform/data/ucontext.h-data b/conform/data/ucontext.h-data
index 790fe97b64..e9abf3b365 100644
--- a/conform/data/ucontext.h-data
+++ b/conform/data/ucontext.h-data
@@ -1,4 +1,4 @@
-#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined ISO23 && !defined POSIX && !defined XPG4 && !defined POSIX2008 && !defined POSIX2024 && !defined XOPEN2K8
+#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined ISO23 && !defined POSIX && !defined XPG4 && !defined POSIX2008 && !defined POSIX2024 && !defined XOPEN2K8 && !defined XOPEN2K24
 type mcontext_t
 
 type ucontext_t
diff --git a/conform/data/unistd.h-data b/conform/data/unistd.h-data
index 5f07994785..e472e70e3b 100644
--- a/conform/data/unistd.h-data
+++ b/conform/data/unistd.h-data
@@ -74,7 +74,7 @@ optional-constant _POSIX_V6_ILP32_OFFBIG
 optional-constant _POSIX_V6_LP64_OFF64
 optional-constant _POSIX_V6_LPBIG_OFFBIG
 # endif
-# if defined XOPEN2K8 || defined POSIX2008 || defined POSIX2024
+# if defined XOPEN2K8 || defined XOPEN2K24 || defined POSIX2008 || defined POSIX2024
 optional-constant _POSIX_V7_ILP32_OFF32
 optional-constant _POSIX_V7_ILP32_OFFBIG
 optional-constant _POSIX_V7_LP64_OFF64
@@ -313,7 +313,7 @@ constant _SC_V6_ILP32_OFFBIG
 constant _SC_V6_LP64_OFF64
 constant _SC_V6_LPBIG_OFFBIG
 # endif
-# if defined XOPEN2K8 || defined POSIX2008 || defined POSIX2024
+# if defined XOPEN2K8 || defined XOPEN2K24 || defined POSIX2008 || defined POSIX2024
 constant _SC_V7_ILP32_OFF32
 constant _SC_V7_ILP32_OFFBIG
 constant _SC_V7_LP64_OFF64
@@ -354,7 +354,7 @@ constant _CS_POSIX_V6_LPBIG_OFFBIG_LIBS
 constant _CS_POSIX_V6_WIDTH_RESTRICTED_ENVS
 constant _CS_V6_ENV
 # endif
-# if defined XOPEN2K8 || defined POSIX2008 || defined POSIX2024
+# if defined XOPEN2K8 || defined XOPEN2K24 || defined POSIX2008 || defined POSIX2024
 constant _CS_POSIX_V7_ILP32_OFF32_CFLAGS
 constant _CS_POSIX_V7_ILP32_OFF32_LDFLAGS
 constant _CS_POSIX_V7_ILP32_OFF32_LIBS
@@ -427,7 +427,7 @@ type intptr_t
 
 function int access (const char*, int)
 function {unsigned int} alarm (unsigned int)
-#if !defined XOPEN2K && !defined XOPEN2K8 && !defined XPG4 && !defined POSIX && !defined POSIX2008 && !defined POSIX2024
+#if !defined XOPEN2K && !defined XOPEN2K8 && !defined XOPEN2K24 && !defined XPG4 && !defined POSIX && !defined POSIX2008 && !defined POSIX2024
 function int brk (void*)
 #endif
 function int chdir (const char*)
@@ -453,13 +453,13 @@ function int execv (const char*, char *const[])
 function int execve (const char*, char *const[], char *const[])
 function int execvp (const char*, char *const[])
 function void _exit (int)
-# if defined XOPEN2K8 || defined POSIX2008 || defined POSIX2024
+# if defined XOPEN2K8 || defined XOPEN2K24 || defined POSIX2008 || defined POSIX2024
 function int faccessat (int, const char*, int, int)
 # endif
 #if !defined XPG4 && !defined POSIX
 function int fchown (int, uid_t, gid_t)
 #endif
-# if defined XOPEN2K8 || defined POSIX2008 || defined POSIX2024
+# if defined XOPEN2K8 || defined XOPEN2K24 || defined POSIX2008 || defined POSIX2024
 function int fchownat (int, const char*, uid_t, gid_t, int)
 # endif
 #if !defined XPG4 && !defined POSIX
@@ -468,7 +468,7 @@ function int fchdir (int)
 #if !defined XPG4 && !defined XPG42
 function int fdatasync (int)
 #endif
-# if defined XOPEN2K8 || defined POSIX2008 || defined POSIX2024
+# if defined XOPEN2K8 || defined XOPEN2K24 || defined POSIX2008 || defined POSIX2024
 function int fexecve (int, char *const[], char *const[])
 # endif
 function pid_t fork (void)
@@ -478,7 +478,7 @@ function int fsync (int)
 function int ftruncate (int, off_t)
 #endif
 function {char*} getcwd (char*, size_t)
-#if !defined XOPEN2K && !defined XOPEN2K8 && !defined XPG4 && !defined POSIX && !defined POSIX2008 && !defined POSIX2024
+#if !defined XOPEN2K && !defined XOPEN2K8 && !defined XOPEN2K24 && !defined XPG4 && !defined POSIX && !defined POSIX2008 && !defined POSIX2024
 function int getdtablesize (void)
 #endif
 function gid_t getegid (void)
@@ -520,7 +520,7 @@ function int isatty (int)
 function int lchown (const char*, uid_t, gid_t)
 #endif
 function int link (const char*, const char*)
-# if defined XOPEN2K8 || defined POSIX2008 || defined POSIX2024
+# if defined XOPEN2K8 || defined XOPEN2K24 || defined POSIX2008 || defined POSIX2024
 function int linkat (int, const char*, int, const char*, int)
 # endif
 # if !defined XPG4 && !defined POSIX && !defined POSIX2008 && !defined POSIX2024
@@ -536,7 +536,7 @@ function int pipe (int[2])
 #if !defined POSIX && !defined XPG4 && !defined XPG42
 function ssize_t pread (int, void*, size_t, off_t)
 #endif
-#if !defined POSIX && !defined XOPEN2K && !defined XOPEN2K8 && !defined POSIX2008 && !defined POSIX2024 && !defined XPG4 && !defined XPG42
+#if !defined POSIX && !defined XOPEN2K && !defined XOPEN2K8 && !defined XOPEN2K24 && !defined POSIX2008 && !defined POSIX2024 && !defined XPG4 && !defined XPG42
 function int pthread_atfork (void(*)(void), void(*)(void), void(*)(void))
 #endif
 #if !defined POSIX && !defined XPG4 && !defined XPG42
@@ -546,11 +546,11 @@ function ssize_t read (int, void*, size_t)
 #if !defined XPG4 && !defined POSIX
 function ssize_t readlink (const char*, char*, size_t)
 #endif
-# if defined XOPEN2K8 || defined POSIX2008 || defined POSIX2024
+# if defined XOPEN2K8 || defined XOPEN2K24 || defined POSIX2008 || defined POSIX2024
 function ssize_t readlinkat (int, const char*, char*, size_t)
 # endif
 function int rmdir (const char*)
-#if !defined XOPEN2K && !defined XOPEN2K8 && !defined XPG4 && !defined POSIX && !defined POSIX2008 && !defined POSIX2024
+#if !defined XOPEN2K && !defined XOPEN2K8 && !defined XOPEN2K24 && !defined XPG4 && !defined POSIX && !defined POSIX2008 && !defined POSIX2024
 function {void*} sbrk (intptr_t)
 #endif
 #if !defined POSIX && !defined XPG4 && !defined XPG42 && !defined UNIX98
@@ -573,7 +573,7 @@ function void swab (const void*, void*, ssize_t)
 #if !defined XPG4 && !defined POSIX
 function int symlink (const char*, const char*)
 # endif
-# if defined XOPEN2K8 || defined POSIX2008 || defined POSIX2024
+# if defined XOPEN2K8 || defined XOPEN2K24 || defined POSIX2008 || defined POSIX2024
 function int symlinkat (const char*, int, const char*)
 # endif
 # if !defined XPG4 && !defined POSIX && !defined POSIX2008 && !defined POSIX2024
@@ -591,7 +591,7 @@ function int ttyname_r (int, char*, size_t)
 function useconds_t ualarm (useconds_t, useconds_t)
 #endif
 function int unlink (const char*)
-# if defined XOPEN2K8 || defined POSIX2008 || defined POSIX2024
+# if defined XOPEN2K8 || defined XOPEN2K24 || defined POSIX2008 || defined POSIX2024
 function int unlinkat (int, const char*, int)
 # endif
 #if defined XPG42 || defined UNIX98 || defined XOPEN2K
diff --git a/conform/data/wchar.h-data b/conform/data/wchar.h-data
index 036d832ac6..fbd310e0ad 100644
--- a/conform/data/wchar.h-data
+++ b/conform/data/wchar.h-data
@@ -11,7 +11,7 @@ type FILE
 #  define FILE __FILE
 # endif
 type size_t
-# if defined XOPEN2K8 || defined POSIX2008 || defined POSIX2024
+# if defined XOPEN2K8 || defined XOPEN2K24 || defined POSIX2008 || defined POSIX2024
 type locale_t
 # endif
 tag {struct tm}
@@ -48,11 +48,11 @@ function wint_t getwchar (void)
 function int mbsinit (const mbstate_t*)
 function size_t mbrlen (const char*, size_t, mbstate_t*)
 function size_t mbrtowc (wchar_t*, const char*, size_t, mbstate_t*)
-# if defined XOPEN2K8 || defined POSIX2008 || defined POSIX2024
+# if defined XOPEN2K8 || defined XOPEN2K24 || defined POSIX2008 || defined POSIX2024
 function size_t mbsnrtowcs (wchar_t*, const char**, size_t, size_t, mbstate_t*)
 # endif
 function size_t mbsrtowcs (wchar_t*, const char**, size_t, mbstate_t*)
-# if defined XOPEN2K8 || defined POSIX2008 || defined POSIX2024
+# if defined XOPEN2K8 || defined XOPEN2K24 || defined POSIX2008 || defined POSIX2024
 function {FILE*} open_wmemstream (wchar_t**, size_t*)
 # endif
 function wint_t putwc (wchar_t, FILE*)
@@ -76,12 +76,12 @@ function int vswprintf (wchar_t*, size_t, const wchar_t*, va_list)
 # ifndef UNIX98
 function int vswscanf (const wchar_t*, const wchar_t*, va_list)
 # endif
-# if defined XOPEN2K8 || defined POSIX2008 || defined POSIX2024
+# if defined XOPEN2K8 || defined XOPEN2K24 || defined POSIX2008 || defined POSIX2024
 function {wchar_t*} wcpcpy (wchar_t*, const wchar_t*)
 function {wchar_t*} wcpncpy (wchar_t*, const wchar_t*, size_t)
 # endif
 function size_t wcrtomb (char*, wchar_t, mbstate_t*)
-# if defined XOPEN2K8 || defined POSIX2008 || defined POSIX2024
+# if defined XOPEN2K8 || defined XOPEN2K24 || defined POSIX2008 || defined POSIX2024
 function int wcscasecmp (const wchar_t*, const wchar_t*)
 function int wcscasecmp_l (const wchar_t*, const wchar_t*, locale_t)
 # endif
@@ -89,24 +89,24 @@ function {wchar_t*} wcscat (wchar_t*, const wchar_t*)
 function {wchar_t*} wcschr (const wchar_t*, wchar_t)
 function int wcscmp (const wchar_t*, const wchar_t*)
 function int wcscoll (const wchar_t*, const wchar_t*)
-# if defined XOPEN2K8 || defined POSIX2008 || defined POSIX2024
+# if defined XOPEN2K8 || defined XOPEN2K24 || defined POSIX2008 || defined POSIX2024
 function int wcscoll_l (const wchar_t*, const wchar_t*, locale_t)
 # endif
 function {wchar_t*} wcscpy (wchar_t*, const wchar_t*)
 function size_t wcscspn (const wchar_t*, const wchar_t*)
-# if defined XOPEN2K8 || defined POSIX2008 || defined POSIX2024
+# if defined XOPEN2K8 || defined XOPEN2K24 || defined POSIX2008 || defined POSIX2024
 function {wchar_t*} wcsdup (const wchar_t*)
 # endif
 function size_t wcsftime (wchar_t*, size_t, const wchar_t*, const struct tm*)
 function size_t wcslen (const wchar_t*)
-# if defined XOPEN2K8 || defined POSIX2008 || defined POSIX2024
+# if defined XOPEN2K8 || defined XOPEN2K24 || defined POSIX2008 || defined POSIX2024
 function int wcsncasecmp (const wchar_t*, const wchar_t*, size_t)
 function int wcsncasecmp_l (const wchar_t*, const wchar_t*, size_t, locale_t)
 # endif
 function {wchar_t*} wcsncat (wchar_t*, const wchar_t*, size_t)
 function int wcsncmp (const wchar_t*, const wchar_t*, size_t)
 function {wchar_t*} wcsncpy (wchar_t*, const wchar_t*, size_t)
-# if defined XOPEN2K8 || defined POSIX2008 || defined POSIX2024
+# if defined XOPEN2K8 || defined XOPEN2K24 || defined POSIX2008 || defined POSIX2024
 function size_t wcsnlen (const wchar_t*, size_t)
 function size_t wcsnrtombs (char*, const wchar_t**, size_t, size_t, mbstate_t*)
 # endif
@@ -136,7 +136,7 @@ function {wchar_t*} wcswcs (const wchar_t*, const wchar_t*)
 function int wcswidth (const wchar_t*, size_t)
 # endif
 function size_t wcsxfrm (wchar_t*, const wchar_t*, size_t)
-# if defined XOPEN2K8 || defined POSIX2008 || defined POSIX2024
+# if defined XOPEN2K8 || defined XOPEN2K24 || defined POSIX2008 || defined POSIX2024
 function size_t wcsxfrm_l (wchar_t*, const wchar_t*, size_t, locale_t)
 # endif
 function int wctob (wint_t)
diff --git a/conform/data/wctype.h-data b/conform/data/wctype.h-data
index ae66c9ca91..ab97e9ad15 100644
--- a/conform/data/wctype.h-data
+++ b/conform/data/wctype.h-data
@@ -2,7 +2,7 @@
 type wint_t
 type wctrans_t
 type wctype_t
-# if defined XOPEN2K8 || defined POSIX2008 || defined POSIX2024
+# if defined XOPEN2K8 || defined XOPEN2K24 || defined POSIX2008 || defined POSIX2024
 type locale_t
 # endif
 
@@ -26,7 +26,7 @@ function wint_t towlower (wint_t)
 function wint_t towupper (wint_t)
 function wctrans_t wctrans (const char*)
 function wctype_t wctype (const char*)
-# if defined XOPEN2K8 || defined POSIX2008 || defined POSIX2024
+# if defined XOPEN2K8 || defined XOPEN2K24 || defined POSIX2008 || defined POSIX2024
 function int iswalnum_l (wint_t, locale_t)
 function int iswalpha_l (wint_t, locale_t)
 function int iswblank_l (wint_t, locale_t)
diff --git a/conform/data/wordexp.h-data b/conform/data/wordexp.h-data
index 7b5ebe030f..db50c3b772 100644
--- a/conform/data/wordexp.h-data
+++ b/conform/data/wordexp.h-data
@@ -16,7 +16,7 @@ constant WRDE_BADCHAR
 constant WRDE_BADVAL
 constant WRDE_CMDSUB
 constant WRDE_NOSPACE
-# if !defined POSIX && !defined XOPEN2K8 && !defined POSIX2008 && !defined POSIX2024
+# if !defined POSIX && !defined XOPEN2K8 && !defined XOPEN2K24 && !defined POSIX2008 && !defined POSIX2024
 constant WRDE_NOSYS
 # endif
 constant WRDE_SYNTAX
-- 
2.53.0



More information about the Libc-alpha mailing list