diff options
author | Tavian Barnes <tavianator@tavianator.com> | 2024-08-28 10:53:10 -0400 |
---|---|---|
committer | Tavian Barnes <tavianator@tavianator.com> | 2024-08-28 17:33:20 -0400 |
commit | b3636fa8864913413455a050c5425447c9e98bc0 (patch) | |
tree | 4ade291bf5652e9e27535602b11edff5a78d08b8 | |
parent | d1febdd40faf2f66a901c42377a6b6efaad1449c (diff) | |
download | bfs-b3636fa8864913413455a050c5425447c9e98bc0.tar.xz |
build: Move feature test macros to prelude.h
This replaces the explicit CPPFLAGS list in flags.mk with just
`-include src/prelude.h`, shortening our compiler command lines and
allowing them to be easily documented.
-rw-r--r-- | build/flags.mk | 14 | ||||
-rw-r--r-- | src/alloc.c | 1 | ||||
-rw-r--r-- | src/alloc.h | 2 | ||||
-rw-r--r-- | src/atomic.h | 2 | ||||
-rw-r--r-- | src/bar.c | 1 | ||||
-rw-r--r-- | src/bfs.h | 2 | ||||
-rw-r--r-- | src/bfstd.c | 1 | ||||
-rw-r--r-- | src/bfstd.h | 2 | ||||
-rw-r--r-- | src/bftw.c | 1 | ||||
-rw-r--r-- | src/bit.h | 2 | ||||
-rw-r--r-- | src/color.c | 1 | ||||
-rw-r--r-- | src/color.h | 2 | ||||
-rw-r--r-- | src/ctx.h | 2 | ||||
-rw-r--r-- | src/diag.c | 1 | ||||
-rw-r--r-- | src/diag.h | 2 | ||||
-rw-r--r-- | src/dir.c | 1 | ||||
-rw-r--r-- | src/dir.h | 2 | ||||
-rw-r--r-- | src/dstring.c | 1 | ||||
-rw-r--r-- | src/dstring.h | 2 | ||||
-rw-r--r-- | src/eval.c | 1 | ||||
-rw-r--r-- | src/eval.h | 2 | ||||
-rw-r--r-- | src/exec.c | 1 | ||||
-rw-r--r-- | src/expr.h | 2 | ||||
-rw-r--r-- | src/fsade.c | 1 | ||||
-rw-r--r-- | src/fsade.h | 2 | ||||
-rw-r--r-- | src/ioq.c | 1 | ||||
-rw-r--r-- | src/ioq.h | 2 | ||||
-rw-r--r-- | src/main.c | 4 | ||||
-rw-r--r-- | src/mtab.c | 1 | ||||
-rw-r--r-- | src/mtab.h | 2 | ||||
-rw-r--r-- | src/opt.c | 1 | ||||
-rw-r--r-- | src/parse.c | 1 | ||||
-rw-r--r-- | src/prelude.h | 58 | ||||
-rw-r--r-- | src/printf.c | 1 | ||||
-rw-r--r-- | src/pwcache.c | 1 | ||||
-rw-r--r-- | src/sanity.h | 2 | ||||
-rw-r--r-- | src/sighook.c | 1 | ||||
-rw-r--r-- | src/stat.c | 1 | ||||
-rw-r--r-- | src/stat.h | 2 | ||||
-rw-r--r-- | src/thread.c | 1 | ||||
-rw-r--r-- | src/thread.h | 2 | ||||
-rw-r--r-- | src/trie.c | 1 | ||||
-rw-r--r-- | src/version.c | 2 | ||||
-rw-r--r-- | src/xregex.c | 1 | ||||
-rw-r--r-- | src/xspawn.c | 1 | ||||
-rw-r--r-- | src/xspawn.h | 2 | ||||
-rw-r--r-- | src/xtime.c | 1 | ||||
-rw-r--r-- | tests/alloc.c | 1 | ||||
-rw-r--r-- | tests/bfstd.c | 1 | ||||
-rw-r--r-- | tests/bit.c | 3 | ||||
-rw-r--r-- | tests/ioq.c | 1 | ||||
-rw-r--r-- | tests/list.c | 3 | ||||
-rw-r--r-- | tests/main.c | 1 | ||||
-rw-r--r-- | tests/sighook.c | 1 | ||||
-rw-r--r-- | tests/tests.h | 2 | ||||
-rw-r--r-- | tests/trie.c | 3 | ||||
-rw-r--r-- | tests/xspawn.c | 1 | ||||
-rw-r--r-- | tests/xtime.c | 3 | ||||
-rw-r--r-- | tests/xtouch.c | 2 |
59 files changed, 62 insertions, 100 deletions
diff --git a/build/flags.mk b/build/flags.mk index 4636620..afe19bc 100644 --- a/build/flags.mk +++ b/build/flags.mk @@ -7,19 +7,7 @@ include build/prelude.mk include gen/vars.mk # Internal flags -_CPPFLAGS := \ - -Isrc \ - -Igen \ - -D__EXTENSIONS__ \ - -D_ATFILE_SOURCE \ - -D_BSD_SOURCE \ - -D_DARWIN_C_SOURCE \ - -D_DEFAULT_SOURCE \ - -D_GNU_SOURCE \ - -D_POSIX_PTHREAD_SEMANTICS \ - -D_FILE_OFFSET_BITS=64 \ - -D_TIME_BITS=64 - +_CPPFLAGS := -Isrc -Igen -include src/prelude.h _CFLAGS := -std=c17 -pthread _LDFLAGS := _LDLIBS := diff --git a/src/alloc.c b/src/alloc.c index 43340f7..223d737 100644 --- a/src/alloc.c +++ b/src/alloc.c @@ -1,7 +1,6 @@ // Copyright © Tavian Barnes <tavianator@tavianator.com> // SPDX-License-Identifier: 0BSD -#include "prelude.h" #include "alloc.h" #include "bfs.h" diff --git a/src/alloc.h b/src/alloc.h index 5113839..7b97b8c 100644 --- a/src/alloc.h +++ b/src/alloc.h @@ -8,8 +8,6 @@ #ifndef BFS_ALLOC_H #define BFS_ALLOC_H -#include "prelude.h" - #include "bfs.h" #include <errno.h> diff --git a/src/atomic.h b/src/atomic.h index 5e29974..2682c29 100644 --- a/src/atomic.h +++ b/src/atomic.h @@ -8,8 +8,6 @@ #ifndef BFS_ATOMIC_H #define BFS_ATOMIC_H -#include "prelude.h" - #include "bfs.h" #include <stdatomic.h> @@ -1,7 +1,6 @@ // Copyright © Tavian Barnes <tavianator@tavianator.com> // SPDX-License-Identifier: 0BSD -#include "prelude.h" #include "bar.h" #include "alloc.h" @@ -8,8 +8,6 @@ #ifndef BFS_H #define BFS_H -#include "prelude.h" - // Standard versions /** Possible __STDC_VERSION__ values. */ diff --git a/src/bfstd.c b/src/bfstd.c index 5a6038d..b29fb7b 100644 --- a/src/bfstd.c +++ b/src/bfstd.c @@ -1,7 +1,6 @@ // Copyright © Tavian Barnes <tavianator@tavianator.com> // SPDX-License-Identifier: 0BSD -#include "prelude.h" #include "bfstd.h" #include "bfs.h" diff --git a/src/bfstd.h b/src/bfstd.h index 67894cd..557f253 100644 --- a/src/bfstd.h +++ b/src/bfstd.h @@ -8,8 +8,6 @@ #ifndef BFS_BFSTD_H #define BFS_BFSTD_H -#include "prelude.h" - #include "bfs.h" #include <stddef.h> @@ -18,7 +18,6 @@ * various helper functions to take fewer parameters. */ -#include "prelude.h" #include "bftw.h" #include "alloc.h" @@ -8,8 +8,6 @@ #ifndef BFS_BIT_H #define BFS_BIT_H -#include "prelude.h" - #include "bfs.h" #include <limits.h> diff --git a/src/color.c b/src/color.c index 0c38c7d..7f653b0 100644 --- a/src/color.c +++ b/src/color.c @@ -1,7 +1,6 @@ // Copyright © Tavian Barnes <tavianator@tavianator.com> // SPDX-License-Identifier: 0BSD -#include "prelude.h" #include "color.h" #include "alloc.h" diff --git a/src/color.h b/src/color.h index 6102480..38f5ad7 100644 --- a/src/color.h +++ b/src/color.h @@ -8,8 +8,6 @@ #ifndef BFS_COLOR_H #define BFS_COLOR_H -#include "prelude.h" - #include "bfs.h" #include "dstring.h" @@ -8,8 +8,6 @@ #ifndef BFS_CTX_H #define BFS_CTX_H -#include "prelude.h" - #include "alloc.h" #include "bftw.h" #include "diag.h" @@ -1,7 +1,6 @@ // Copyright © Tavian Barnes <tavianator@tavianator.com> // SPDX-License-Identifier: 0BSD -#include "prelude.h" #include "diag.h" #include "alloc.h" @@ -8,8 +8,6 @@ #ifndef BFS_DIAG_H #define BFS_DIAG_H -#include "prelude.h" - #include "bfs.h" #include "bfstd.h" @@ -1,7 +1,6 @@ // Copyright © Tavian Barnes <tavianator@tavianator.com> // SPDX-License-Identifier: 0BSD -#include "prelude.h" #include "dir.h" #include "alloc.h" @@ -8,8 +8,6 @@ #ifndef BFS_DIR_H #define BFS_DIR_H -#include "prelude.h" - #include "bfs.h" #include <sys/types.h> diff --git a/src/dstring.c b/src/dstring.c index 2f3abc5..36ed2c7 100644 --- a/src/dstring.c +++ b/src/dstring.c @@ -1,7 +1,6 @@ // Copyright © Tavian Barnes <tavianator@tavianator.com> // SPDX-License-Identifier: 0BSD -#include "prelude.h" #include "dstring.h" #include "alloc.h" diff --git a/src/dstring.h b/src/dstring.h index a6103e3..6d50bc8 100644 --- a/src/dstring.h +++ b/src/dstring.h @@ -8,8 +8,6 @@ #ifndef BFS_DSTRING_H #define BFS_DSTRING_H -#include "prelude.h" - #include "bfs.h" #include "bfstd.h" @@ -5,7 +5,6 @@ * Implementation of all the primary expressions. */ -#include "prelude.h" #include "eval.h" #include "atomic.h" @@ -9,8 +9,6 @@ #ifndef BFS_EVAL_H #define BFS_EVAL_H -#include "prelude.h" - struct bfs_ctx; struct bfs_expr; @@ -1,7 +1,6 @@ // Copyright © Tavian Barnes <tavianator@tavianator.com> // SPDX-License-Identifier: 0BSD -#include "prelude.h" #include "exec.h" #include "alloc.h" @@ -8,8 +8,6 @@ #ifndef BFS_EXPR_H #define BFS_EXPR_H -#include "prelude.h" - #include "color.h" #include "eval.h" #include "stat.h" diff --git a/src/fsade.c b/src/fsade.c index b10c851..30b3018 100644 --- a/src/fsade.c +++ b/src/fsade.c @@ -1,7 +1,6 @@ // Copyright © Tavian Barnes <tavianator@tavianator.com> // SPDX-License-Identifier: 0BSD -#include "prelude.h" #include "fsade.h" #include "atomic.h" diff --git a/src/fsade.h b/src/fsade.h index 9c7d117..77cf82a 100644 --- a/src/fsade.h +++ b/src/fsade.h @@ -9,8 +9,6 @@ #ifndef BFS_FSADE_H #define BFS_FSADE_H -#include "prelude.h" - #include "bfs.h" #define BFS_CAN_CHECK_ACL (BFS_HAS_ACL_GET_FILE || BFS_HAS_ACL_TRIVIAL) @@ -118,7 +118,6 @@ * [1]: https://arxiv.org/abs/2201.02179 */ -#include "prelude.h" #include "ioq.h" #include "alloc.h" @@ -8,8 +8,6 @@ #ifndef BFS_IOQ_H #define BFS_IOQ_H -#include "prelude.h" - #include "dir.h" #include "stat.h" @@ -20,6 +20,7 @@ * - bftw.[ch] (an extended version of nftw(3)) * * - Utilities: + * - prelude.h (feature test macros; automatically included) * - alloc.[ch] (memory allocation) * - atomic.h (atomic operations) * - bar.[ch] (a terminal status bar) @@ -27,7 +28,6 @@ * - bfs.h (configuration and fundamental utilities) * - bfstd.[ch] (standard library wrappers/polyfills) * - color.[ch] (for pretty terminal colors) - * - prelude.h (configuration and feature/platform detection) * - diag.[ch] (formats diagnostic messages) * - dir.[ch] (a directory API facade) * - dstring.[ch] (a dynamic string library) @@ -48,8 +48,6 @@ * - xtime.[ch] (date/time handling utilities) */ -#include "prelude.h" - #include "bfstd.h" #include "ctx.h" #include "diag.h" @@ -1,7 +1,6 @@ // Copyright © Tavian Barnes <tavianator@tavianator.com> // SPDX-License-Identifier: 0BSD -#include "prelude.h" #include "mtab.h" #include "alloc.h" @@ -8,8 +8,6 @@ #ifndef BFS_MTAB_H #define BFS_MTAB_H -#include "prelude.h" - struct bfs_stat; /** @@ -25,7 +25,6 @@ * effects are reachable at all, skipping the traversal if not. */ -#include "prelude.h" #include "opt.h" #include "bfs.h" diff --git a/src/parse.c b/src/parse.c index a90dc2d..57c60ae 100644 --- a/src/parse.c +++ b/src/parse.c @@ -8,7 +8,6 @@ * flags like always-true options, and skipping over paths wherever they appear. */ -#include "prelude.h" #include "parse.h" #include "alloc.h" diff --git a/src/prelude.h b/src/prelude.h index 5f7203e..a0cc2a1 100644 --- a/src/prelude.h +++ b/src/prelude.h @@ -2,12 +2,66 @@ // SPDX-License-Identifier: 0BSD /** - * Configuration and feature/platform detection. + * Praeludium. + * + * This header is automatically included in every translation unit, before any + * other headers, so it can set feature test macros[1][2]. This sets up our own + * mini-dialect of C, which includes + * + * - Standard C17 and POSIX.1 2024 features + * - Portable and platform-specific extensions + * - Convenience macros like `bool`, `alignof`, etc. + * - Common compiler extensions like __has_include() + * + * Further bfs-specific utilities are defined in "bfs.h". + * + * [1]: https://www.gnu.org/software/libc/manual/html_node/Feature-Test-Macros.html + * [2]: https://pubs.opengroup.org/onlinepubs/9799919799/functions/V2_chap02.html */ #ifndef BFS_PRELUDE_H #define BFS_PRELUDE_H +// Feature test macros + +/** + * Linux and BSD handle _POSIX_C_SOURCE differently: on Linux, it enables POSIX + * interfaces that are not visible by default. On BSD, it also *disables* most + * extensions, giving a strict POSIX environment. Since we want the extensions, + * we don't set _POSIX_C_SOURCE. + */ +// #define _POSIX_C_SOURCE 202405L + +/** openat() etc. */ +#define _ATFILE_SOURCE 1 + +/** BSD-derived extensions. */ +#define _BSD_SOURCE 1 + +/** glibc successor to _BSD_SOURCE. */ +#define _DEFAULT_SOURCE 1 + +/** GNU extensions. */ +#define _GNU_SOURCE 1 + +/** Use 64-bit off_t. */ +#define _FILE_OFFSET_BITS 64 + +/** Use 64-bit time_t. */ +#define _TIME_BITS 64 + +/** macOS extensions. */ +#if __APPLE__ +# define _DARWIN_C_SOURCE 1 +#endif + +/** Solaris extensions. */ +#if __sun +# define __EXTENSIONS__ 1 +// https://illumos.org/man/3C/getpwnam#standard-conforming +# define _POSIX_PTHREAD_SEMANTICS 1 +#endif + // Get the convenience macros that became standard spellings in C23 #if __STDC_VERSION__ < 202311L @@ -20,7 +74,7 @@ /** * C23 deprecates `noreturn void` in favour of `[[noreturn]] void`, so we expose - * _noreturn instead with the other attributes. + * _noreturn instead with the other attributes in "bfs.h". */ // #include <stdnoreturn.h> diff --git a/src/printf.c b/src/printf.c index 39abdcc..30ec201 100644 --- a/src/printf.c +++ b/src/printf.c @@ -1,7 +1,6 @@ // Copyright © Tavian Barnes <tavianator@tavianator.com> // SPDX-License-Identifier: 0BSD -#include "prelude.h" #include "printf.h" #include "alloc.h" diff --git a/src/pwcache.c b/src/pwcache.c index 35a9925..c2b575e 100644 --- a/src/pwcache.c +++ b/src/pwcache.c @@ -1,7 +1,6 @@ // Copyright © Tavian Barnes <tavianator@tavianator.com> // SPDX-License-Identifier: 0BSD -#include "prelude.h" #include "pwcache.h" #include "alloc.h" diff --git a/src/sanity.h b/src/sanity.h index 17450a3..0b770cf 100644 --- a/src/sanity.h +++ b/src/sanity.h @@ -8,8 +8,6 @@ #ifndef BFS_SANITY_H #define BFS_SANITY_H -#include "prelude.h" - #include <stddef.h> // Call macro(ptr, size) or macro(ptr, sizeof(*ptr)) diff --git a/src/sighook.c b/src/sighook.c index d697895..861a0b5 100644 --- a/src/sighook.c +++ b/src/sighook.c @@ -17,7 +17,6 @@ * drop to zero. Once it does, the old pointer can be safely freed. */ -#include "prelude.h" #include "sighook.h" #include "alloc.h" @@ -1,7 +1,6 @@ // Copyright © Tavian Barnes <tavianator@tavianator.com> // SPDX-License-Identifier: 0BSD -#include "prelude.h" #include "stat.h" #include "atomic.h" @@ -12,8 +12,6 @@ #ifndef BFS_STAT_H #define BFS_STAT_H -#include "prelude.h" - #include "bfs.h" #include <sys/stat.h> diff --git a/src/thread.c b/src/thread.c index c555d1f..d61ff8c 100644 --- a/src/thread.c +++ b/src/thread.c @@ -1,7 +1,6 @@ // Copyright © Tavian Barnes <tavianator@tavianator.com> // SPDX-License-Identifier: 0BSD -#include "prelude.h" #include "thread.h" #include "bfstd.h" diff --git a/src/thread.h b/src/thread.h index 7ecda86..7d12468 100644 --- a/src/thread.h +++ b/src/thread.h @@ -8,8 +8,6 @@ #ifndef BFS_THREAD_H #define BFS_THREAD_H -#include "prelude.h" - #include <pthread.h> /** Thread entry point type. */ @@ -81,7 +81,6 @@ * and insert intermediate singleton "jump" nodes when necessary. */ -#include "prelude.h" #include "trie.h" #include "alloc.h" diff --git a/src/version.c b/src/version.c index 2822927..7479a9f 100644 --- a/src/version.c +++ b/src/version.c @@ -1,8 +1,6 @@ // Copyright © Tavian Barnes <tavianator@tavianator.com> // SPDX-License-Identifier: 0BSD -#include "prelude.h" - #include "bfs.h" const char bfs_version[] = { diff --git a/src/xregex.c b/src/xregex.c index 52f8222..796544e 100644 --- a/src/xregex.c +++ b/src/xregex.c @@ -1,7 +1,6 @@ // Copyright © Tavian Barnes <tavianator@tavianator.com> // SPDX-License-Identifier: 0BSD -#include "prelude.h" #include "xregex.h" #include "alloc.h" diff --git a/src/xspawn.c b/src/xspawn.c index 0b83c8d..b3eed79 100644 --- a/src/xspawn.c +++ b/src/xspawn.c @@ -1,7 +1,6 @@ // Copyright © Tavian Barnes <tavianator@tavianator.com> // SPDX-License-Identifier: 0BSD -#include "prelude.h" #include "xspawn.h" #include "alloc.h" diff --git a/src/xspawn.h b/src/xspawn.h index 60ef1ab..9cfbaf7 100644 --- a/src/xspawn.h +++ b/src/xspawn.h @@ -8,8 +8,6 @@ #ifndef BFS_XSPAWN_H #define BFS_XSPAWN_H -#include "prelude.h" - #include <sys/resource.h> #include <sys/types.h> #include <unistd.h> diff --git a/src/xtime.c b/src/xtime.c index 75ace72..dd9b60f 100644 --- a/src/xtime.c +++ b/src/xtime.c @@ -1,7 +1,6 @@ // Copyright © Tavian Barnes <tavianator@tavianator.com> // SPDX-License-Identifier: 0BSD -#include "prelude.h" #include "xtime.h" #include "bfs.h" diff --git a/tests/alloc.c b/tests/alloc.c index ec8e8f7..f91b428 100644 --- a/tests/alloc.c +++ b/tests/alloc.c @@ -1,7 +1,6 @@ // Copyright © Tavian Barnes <tavianator@tavianator.com> // SPDX-License-Identifier: 0BSD -#include "prelude.h" #include "tests.h" #include "alloc.h" diff --git a/tests/bfstd.c b/tests/bfstd.c index 068e371..fe64ff3 100644 --- a/tests/bfstd.c +++ b/tests/bfstd.c @@ -1,7 +1,6 @@ // Copyright © Tavian Barnes <tavianator@tavianator.com> // SPDX-License-Identifier: 0BSD -#include "prelude.h" #include "tests.h" #include "bfstd.h" diff --git a/tests/bit.c b/tests/bit.c index 854398c..1446b13 100644 --- a/tests/bit.c +++ b/tests/bit.c @@ -1,12 +1,11 @@ // Copyright © Tavian Barnes <tavianator@tavianator.com> // SPDX-License-Identifier: 0BSD -#include "prelude.h" +#include "tests.h" #include "bfs.h" #include "bit.h" #include "diag.h" -#include "tests.h" #include <limits.h> #include <stdint.h> diff --git a/tests/ioq.c b/tests/ioq.c index 61a924f..a2db813 100644 --- a/tests/ioq.c +++ b/tests/ioq.c @@ -1,7 +1,6 @@ // Copyright © Tavian Barnes <tavianator@tavianator.com> // SPDX-License-Identifier: 0BSD -#include "prelude.h" #include "tests.h" #include "bfstd.h" diff --git a/tests/list.c b/tests/list.c index 820fbe4..b3d74a1 100644 --- a/tests/list.c +++ b/tests/list.c @@ -1,11 +1,10 @@ // Copyright © Tavian Barnes <tavianator@tavianator.com> // SPDX-License-Identifier: 0BSD -#include "prelude.h" +#include "tests.h" #include "bfs.h" #include "list.h" -#include "tests.h" struct item { int n; diff --git a/tests/main.c b/tests/main.c index 9cbdcfb..dcb5d98 100644 --- a/tests/main.c +++ b/tests/main.c @@ -5,7 +5,6 @@ * Entry point for unit tests. */ -#include "prelude.h" #include "tests.h" #include "bfstd.h" diff --git a/tests/sighook.c b/tests/sighook.c index adc53d8..4121a44 100644 --- a/tests/sighook.c +++ b/tests/sighook.c @@ -1,7 +1,6 @@ // Copyright © Tavian Barnes <tavianator@tavianator.com> // SPDX-License-Identifier: 0BSD -#include "prelude.h" #include "tests.h" #include "atomic.h" diff --git a/tests/tests.h b/tests/tests.h index 2c1eb3a..4c6b3d2 100644 --- a/tests/tests.h +++ b/tests/tests.h @@ -8,8 +8,6 @@ #ifndef BFS_TESTS_H #define BFS_TESTS_H -#include "prelude.h" - #include "bfstd.h" #include "diag.h" diff --git a/tests/trie.c b/tests/trie.c index 41b729e..9e9a294 100644 --- a/tests/trie.c +++ b/tests/trie.c @@ -1,11 +1,10 @@ // Copyright © Tavian Barnes <tavianator@tavianator.com> // SPDX-License-Identifier: 0BSD -#include "prelude.h" +#include "tests.h" #include "bfs.h" #include "diag.h" -#include "tests.h" #include "trie.h" #include <stdlib.h> diff --git a/tests/xspawn.c b/tests/xspawn.c index 20617de..3194adc 100644 --- a/tests/xspawn.c +++ b/tests/xspawn.c @@ -1,7 +1,6 @@ // Copyright © Tavian Barnes <tavianator@tavianator.com> // SPDX-License-Identifier: 0BSD -#include "prelude.h" #include "tests.h" #include "alloc.h" diff --git a/tests/xtime.c b/tests/xtime.c index 6d7716d..c87a69e 100644 --- a/tests/xtime.c +++ b/tests/xtime.c @@ -1,12 +1,11 @@ // Copyright © Tavian Barnes <tavianator@tavianator.com> // SPDX-License-Identifier: 0BSD -#include "prelude.h" +#include "tests.h" #include "bfs.h" #include "bfstd.h" #include "diag.h" -#include "tests.h" #include "xtime.h" #include <errno.h> diff --git a/tests/xtouch.c b/tests/xtouch.c index 705d4e2..e7c2e00 100644 --- a/tests/xtouch.c +++ b/tests/xtouch.c @@ -1,8 +1,6 @@ // Copyright © Tavian Barnes <tavianator@tavianator.com> // SPDX-License-Identifier: 0BSD -#include "prelude.h" - #include "bfstd.h" #include "sanity.h" #include "xtime.h" |