1 files changed, 16 insertions, 35 deletions

diff --git a/src/prelude.h b/src/prelude.h
index a23b167..0944df1 100644
--- a/src/prelude.h
+++ b/src/prelude.h
@@ -16,7 +16,8 @@
 #define C17 201710L
 #define C23 202311L
 
-#include <stddef.h>
+// Get the static_assert() definition as well as __GLIBC__
+#include <assert.h>
 
 #if __STDC_VERSION__ < C23
 #  include <stdalign.h>
@@ -49,11 +50,8 @@ extern const char bfs_version[];
 #if __has_include(<paths.h>)
 #  define BFS_HAS_PATHS_H true
 #endif
-#if __has_include(<sys/acl.h>)
-#  define BFS_HAS_SYS_ACL_H true
-#endif
-#if __has_include(<sys/capability.h>)
-#  define BFS_HAS_SYS_CAPABILITY_H true
+#if __has_include(<stdbit.h>)
+#  define BFS_HAS_STDBIT_H true
 #endif
 #if __has_include(<sys/extattr.h>)
 #  define BFS_HAS_SYS_EXTATTR_H true
@@ -81,8 +79,7 @@ extern const char bfs_version[];
 
 #define BFS_HAS_MNTENT_H __GLIBC__
 #define BFS_HAS_PATHS_H true
-#define BFS_HAS_SYS_ACL_H true
-#define BFS_HAS_SYS_CAPABILITY_H __linux__
+#define BFS_HAS_STDBIT_H (__STDC_VERSION__ >= C23)
 #define BFS_HAS_SYS_EXTATTR_H __FreeBSD__
 #define BFS_HAS_SYS_MKDEV_H false
 #define BFS_HAS_SYS_PARAM_H true
@@ -99,14 +96,8 @@ extern const char bfs_version[];
 #ifndef BFS_USE_PATHS_H
 #  define BFS_USE_PATHS_H BFS_HAS_PATHS_H
 #endif
-#ifndef BFS_USE_SYS_ACL_H
-#  define BFS_USE_SYS_ACL_H (BFS_HAS_SYS_ACL_H && !__illumos__ && (!__linux__ || BFS_USE_LIBACL))
-#endif
-#ifndef BFS_USE_SYS_CAPABILITY_H
-#  define BFS_USE_SYS_CAPABILITY_H (BFS_HAS_SYS_CAPABILITY_H && !__FreeBSD__ && (!__linux__ || BFS_USE_LIBCAP))
-#endif
 #ifndef BFS_USE_SYS_EXTATTR_H
-#  define BFS_USE_SYS_EXTATTR_H (BFS_HAS_SYS_EXTATTR_H && !__DragonFly__)
+#  define BFS_USE_SYS_EXTATTR_H BFS_HAS_SYS_EXTATTR_H
 #endif
 #ifndef BFS_USE_SYS_MKDEV_H
 #  define BFS_USE_SYS_MKDEV_H BFS_HAS_SYS_MKDEV_H
@@ -141,27 +132,12 @@ extern const char bfs_version[];
 #  define __has_attribute(attr) false
 #endif
 
-// Platform detection
-
-// Get the definition of BSD if available
-#if BFS_USE_SYS_PARAM_H
-#  include <sys/param.h>
-#endif
-
-#ifndef __GLIBC_PREREQ
-#  define __GLIBC_PREREQ(maj, min) false
-#endif
-
-#ifndef __NetBSD_Prereq__
-#  define __NetBSD_Prereq__(maj, min, patch) false
-#endif
-
 // Fundamental utilities
 
 /**
  * Get the length of an array.
  */
-#define countof(array) (sizeof(array) / sizeof(0[array]))
+#define countof(...) (sizeof(__VA_ARGS__) / sizeof(0[__VA_ARGS__]))
 
 /**
  * False sharing/destructive interference/largest cache line size.
@@ -186,10 +162,6 @@ extern const char bfs_version[];
  */
 #define cache_align alignas(FALSE_SHARING_SIZE)
 
-#if __COSMOPOLITAN__
-typedef long double max_align_t;
-#endif
-
 // Wrappers for attributes
 
 /**
@@ -247,6 +219,15 @@ typedef long double max_align_t;
 #endif
 
 /**
+ * Annotates functions that potentially modify and return format strings.
+ */
+#if __has_attribute(format_arg)
+#  define attr_format_arg(arg) __attribute__((format_arg(arg)))
+#else
+#  define attr_format_arg(args)
+#endif
+
+/**
  * Annotates allocator-like functions.
  */
 #if __has_attribute(malloc)