From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Sun, 6 Jul 2025 02:33:58 +0000 (+0900)
Subject: basic/include: replace _Static_assert() with static_assert()
X-Git-Tag: v258-rc1~153
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ffe8f21302c58a0940a1bbb1e7218d922e867f20;p=thirdparty%2Fsystemd.git

basic/include: replace _Static_assert() with static_assert()

If one of the header is included in a C++ source file, then using
_Static_assert() triggers compile error for some reasons.
Let's use static_assert(), which can be used by both C and C++ code.
---

diff --git a/src/basic/include/sched.h b/src/basic/include/sched.h
index 13eb8d059e6..41c830e26b5 100644
--- a/src/basic/include/sched.h
+++ b/src/basic/include/sched.h
@@ -8,19 +8,21 @@
 
 #include_next <sched.h>
 
+#include <assert.h>
+
 /* 769071ac9f20b6a447410c7eaa55d1a5233ef40c (5.8),
  * defined in sched.h since glibc-2.36. */
 #ifndef CLONE_NEWTIME
 #  define CLONE_NEWTIME 0x00000080
 #else
-_Static_assert(CLONE_NEWTIME == 0x00000080, "");
+static_assert(CLONE_NEWTIME == 0x00000080, "");
 #endif
 
 /* Not exposed yet. Defined at include/linux/sched.h */
 #ifndef PF_KTHREAD
 #  define PF_KTHREAD 0x00200000
 #else
-_Static_assert(PF_KTHREAD == 0x00200000, "");
+static_assert(PF_KTHREAD == 0x00200000, "");
 #endif
 
 /* The maximum thread/process name length including trailing NUL byte. This mimics the kernel definition of
@@ -31,5 +33,5 @@ _Static_assert(PF_KTHREAD == 0x00200000, "");
 #ifndef TASK_COMM_LEN
 #  define TASK_COMM_LEN 16
 #else
-_Static_assert(TASK_COMM_LEN == 16, "");
+static_assert(TASK_COMM_LEN == 16, "");
 #endif
diff --git a/src/basic/include/sys/mman.h b/src/basic/include/sys/mman.h
index 50b03bddf03..68623df7890 100644
--- a/src/basic/include/sys/mman.h
+++ b/src/basic/include/sys/mman.h
@@ -3,16 +3,18 @@
 
 #include_next <sys/mman.h>
 
+#include <assert.h>
+
 /* since glibc-2.38 */
 #ifndef MFD_NOEXEC_SEAL
 #  define MFD_NOEXEC_SEAL 0x0008U
 #else
-_Static_assert(MFD_NOEXEC_SEAL == 0x0008U, "");
+static_assert(MFD_NOEXEC_SEAL == 0x0008U, "");
 #endif
 
 /* since glibc-2.38 */
 #ifndef MFD_EXEC
 #  define MFD_EXEC 0x0010U
 #else
-_Static_assert(MFD_EXEC == 0x0010U, "");
+static_assert(MFD_EXEC == 0x0010U, "");
 #endif
diff --git a/src/basic/include/sys/random.h b/src/basic/include/sys/random.h
index c0d1197aa50..5750aac1bc0 100644
--- a/src/basic/include/sys/random.h
+++ b/src/basic/include/sys/random.h
@@ -3,9 +3,11 @@
 
 #include_next <sys/random.h>
 
+#include <assert.h>
+
 /* Defined since glibc-2.32. */
 #ifndef GRND_INSECURE
 #  define GRND_INSECURE 0x0004
 #else
-_Static_assert(GRND_INSECURE == 0x0004, "");
+static_assert(GRND_INSECURE == 0x0004, "");
 #endif
diff --git a/src/basic/include/sys/wait.h b/src/basic/include/sys/wait.h
index 0981631cf65..3a80e8489ab 100644
--- a/src/basic/include/sys/wait.h
+++ b/src/basic/include/sys/wait.h
@@ -3,9 +3,11 @@
 
 #include_next <sys/wait.h>
 
+#include <assert.h>
+
 /* since glibc-2.36 */
 #ifndef P_PIDFD
 #  define P_PIDFD 3
 #else
-_Static_assert(P_PIDFD == 3, "");
+static_assert(P_PIDFD == 3, "");
 #endif