basic: Use Static_assert() in missing_syscall_def.h

Let's use Static_assert() so we don't have to include forward.h in
missing_syscall_def.h.

diff --git a/src/basic/missing_syscall_def.h b/src/basic/missing_syscall_def.h
index fd8f3e5db5408447e7c724ada607f21dbb186fb3..4db051a0b09b3a1edde0092437d4686b3f1eebb0 100644 (file)
--- a/src/basic/missing_syscall_def.h
+++ b/src/basic/missing_syscall_def.h
@@ -6,8 +6,6 @@
  */
 #pragma once
 
-#include "forward.h"
-
 /* Note: if this code looks strange, this is because it is derived from the same
  * template as the per-syscall blocks below. */
 #  if defined(__aarch64__)
@@ -100,7 +98,7 @@
 /* may be an (invalid) negative number due to libseccomp, see PR 13319 */
 #  if defined __NR_close_range && __NR_close_range >= 0
 #    if defined systemd_NR_close_range
-assert_cc(__NR_close_range == systemd_NR_close_range);
+_Static_assert(__NR_close_range == systemd_NR_close_range, "");
 #    endif
 #  else
 #    if defined __NR_close_range
@@ -168,7 +166,7 @@ assert_cc(__NR_close_range == systemd_NR_close_range);
 /* may be an (invalid) negative number due to libseccomp, see PR 13319 */
 #  if defined __NR_fchmodat2 && __NR_fchmodat2 >= 0
 #    if defined systemd_NR_fchmodat2
-assert_cc(__NR_fchmodat2 == systemd_NR_fchmodat2);
+_Static_assert(__NR_fchmodat2 == systemd_NR_fchmodat2, "");
 #    endif
 #  else
 #    if defined __NR_fchmodat2
@@ -236,7 +234,7 @@ assert_cc(__NR_fchmodat2 == systemd_NR_fchmodat2);
 /* may be an (invalid) negative number due to libseccomp, see PR 13319 */
 #  if defined __NR_mount_setattr && __NR_mount_setattr >= 0
 #    if defined systemd_NR_mount_setattr
-assert_cc(__NR_mount_setattr == systemd_NR_mount_setattr);
+_Static_assert(__NR_mount_setattr == systemd_NR_mount_setattr, "");
 #    endif
 #  else
 #    if defined __NR_mount_setattr
@@ -304,7 +302,7 @@ assert_cc(__NR_mount_setattr == systemd_NR_mount_setattr);
 /* may be an (invalid) negative number due to libseccomp, see PR 13319 */
 #  if defined __NR_openat2 && __NR_openat2 >= 0
 #    if defined systemd_NR_openat2
-assert_cc(__NR_openat2 == systemd_NR_openat2);
+_Static_assert(__NR_openat2 == systemd_NR_openat2, "");
 #    endif
 #  else
 #    if defined __NR_openat2
@@ -372,7 +370,7 @@ assert_cc(__NR_openat2 == systemd_NR_openat2);
 /* may be an (invalid) negative number due to libseccomp, see PR 13319 */
 #  if defined __NR_quotactl_fd && __NR_quotactl_fd >= 0
 #    if defined systemd_NR_quotactl_fd
-assert_cc(__NR_quotactl_fd == systemd_NR_quotactl_fd);
+_Static_assert(__NR_quotactl_fd == systemd_NR_quotactl_fd, "");
 #    endif
 #  else
 #    if defined __NR_quotactl_fd
@@ -440,7 +438,7 @@ assert_cc(__NR_quotactl_fd == systemd_NR_quotactl_fd);
 /* may be an (invalid) negative number due to libseccomp, see PR 13319 */
 #  if defined __NR_removexattrat && __NR_removexattrat >= 0
 #    if defined systemd_NR_removexattrat
-assert_cc(__NR_removexattrat == systemd_NR_removexattrat);
+_Static_assert(__NR_removexattrat == systemd_NR_removexattrat, "");
 #    endif
 #  else
 #    if defined __NR_removexattrat
@@ -508,7 +506,7 @@ assert_cc(__NR_removexattrat == systemd_NR_removexattrat);
 /* may be an (invalid) negative number due to libseccomp, see PR 13319 */
 #  if defined __NR_setxattrat && __NR_setxattrat >= 0
 #    if defined systemd_NR_setxattrat
-assert_cc(__NR_setxattrat == systemd_NR_setxattrat);
+_Static_assert(__NR_setxattrat == systemd_NR_setxattrat, "");
 #    endif
 #  else
 #    if defined __NR_setxattrat

diff --git a/src/basic/missing_syscalls.py b/src/basic/missing_syscalls.py
index 0d351e322d90d0c846eb87b6f090297b68bad64f..646ab4e34e3663d43a9a66e40d99312e0da69115 100644 (file)
--- a/src/basic/missing_syscalls.py
+++ b/src/basic/missing_syscalls.py
@@ -96,7 +96,7 @@ DEF_TEMPLATE_C = '''\
 /* may be an (invalid) negative number due to libseccomp, see PR 13319 */
 #  if defined __NR_{syscall} && __NR_{syscall} >= 0
 #    if defined systemd_NR_{syscall}
-assert_cc(__NR_{syscall} == systemd_NR_{syscall});
+_Static_assert(__NR_{syscall} == systemd_NR_{syscall}, "");
 #    endif
 #  else
 #    if defined __NR_{syscall}