From e34e7bdf42620eaa24054487ce7c53df7e30e03f Mon Sep 17 00:00:00 2001 From: Andrew Deason Date: Wed, 17 May 2023 15:27:39 -0500 Subject: [PATCH] tests: Standardize src/tests includes Convert all C files in src/tests to include afsconfig.h and afs/param.h as the very first includes, like the rest of the tree does. Remove references to config.h and HAVE_CONFIG_H; we don't use those. Change-Id: I07166de1b0c80bf11a91a0758b32fb77cdf779d8 Reviewed-on: https://gerrit.openafs.org/15437 Reviewed-by: Cheyenne Wills Reviewed-by: Michael Meffie Tested-by: BuildBot Reviewed-by: Andrew Deason --- src/tests/append-over-page.c | 5 ++--- src/tests/apwd.c | 5 ++--- src/tests/asu.c | 5 ++--- src/tests/blocks-new-file.c | 5 ++--- src/tests/create-dirs.c | 5 ++--- src/tests/create-files.c | 5 ++--- src/tests/create-remove.c | 5 ++--- src/tests/create-stat.c | 5 +---- src/tests/create-symlinks.c | 5 ++--- src/tests/dup2-and-unlog.c | 5 ++--- src/tests/echo-n.c | 5 ++--- src/tests/err.c | 5 ++--- src/tests/errx.c | 5 ++--- src/tests/exit-wo-close.c | 5 ++--- src/tests/fchmod.c | 5 ++--- src/tests/fhbench.c | 5 ++--- src/tests/fs_lib.c | 5 ++--- src/tests/fsx.c | 3 +++ src/tests/ga-test.c | 5 ++--- src/tests/hardlink1.c | 5 ++--- src/tests/hardlink2.c | 5 ++--- src/tests/hardlink4.c | 5 ++--- src/tests/intr-read.c | 5 ++--- src/tests/invalidate-file.c | 5 ++--- src/tests/kill-softer.c | 5 ++--- src/tests/kill-softly.c | 5 ++--- src/tests/large-dir.c | 5 ++--- src/tests/large-dir2.c | 5 ++--- src/tests/large-dir3.c | 5 ++--- src/tests/make-page.c | 5 ++--- src/tests/mkdir2.c | 5 ++--- src/tests/mkdir3.c | 5 ++--- src/tests/mmap-and-read.c | 5 ++--- src/tests/mmap-cat.c | 5 ++--- src/tests/mmap-shared-write.c | 5 ++--- src/tests/mmap-vs-read.c | 5 ++--- src/tests/mmap-vs-read2.c | 5 ++--- src/tests/null-search.c | 3 +++ src/tests/pine.c | 5 ++--- src/tests/read-vs-mmap.c | 5 ++--- src/tests/read-vs-mmap2.c | 5 ++--- src/tests/read-write.c | 5 ++--- src/tests/readdir-vs-lstat.c | 5 ++--- src/tests/rename-under-feet.c | 5 ++--- src/tests/rename5.c | 5 ++--- src/tests/rename6.c | 5 ++--- src/tests/rm-rf.c | 5 ++--- src/tests/still-there-p.c | 5 ++--- src/tests/strange-characters-c.c | 5 ++--- src/tests/symlink.c | 5 ++--- src/tests/test-parallel1.c | 5 ++--- src/tests/test-parallel2.c | 5 ++--- src/tests/test-setgroups.c | 5 ++--- src/tests/test-setpag.c | 5 ++--- src/tests/truncate-files.c | 5 ++--- src/tests/truncate.c | 5 ++--- src/tests/utime-dir.c | 5 ++--- src/tests/utime-file.c | 5 ++--- src/tests/verr.c | 5 ++--- src/tests/verrx.c | 5 ++--- src/tests/vwarn.c | 5 ++--- src/tests/vwarnx.c | 5 ++--- src/tests/warn.c | 5 ++--- src/tests/warnerr.c | 5 ++--- src/tests/warnx.c | 5 ++--- src/tests/write-closed.c | 5 ++--- src/tests/write-closed2.c | 4 ---- src/tests/write-large.c | 7 +++---- src/tests/write-rand.c | 5 ++--- src/tests/write-ro-file.c | 5 ++--- src/tests/write-ucc.c | 5 ++--- src/tests/write3.c | 5 ++--- 72 files changed, 144 insertions(+), 213 deletions(-) diff --git a/src/tests/append-over-page.c b/src/tests/append-over-page.c index e824acd62b..eb7b5ea40e 100644 --- a/src/tests/append-over-page.c +++ b/src/tests/append-over-page.c @@ -31,9 +31,8 @@ * SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include +#include #include #include diff --git a/src/tests/apwd.c b/src/tests/apwd.c index 613c34f155..7b9108df2d 100644 --- a/src/tests/apwd.c +++ b/src/tests/apwd.c @@ -31,9 +31,8 @@ * SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include +#include #include #include diff --git a/src/tests/asu.c b/src/tests/asu.c index ddd532ddae..1216d2908e 100644 --- a/src/tests/asu.c +++ b/src/tests/asu.c @@ -31,9 +31,8 @@ * SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include +#include #include #include diff --git a/src/tests/blocks-new-file.c b/src/tests/blocks-new-file.c index b18d7c205d..e2608a90b9 100644 --- a/src/tests/blocks-new-file.c +++ b/src/tests/blocks-new-file.c @@ -31,9 +31,8 @@ * SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include +#include #include #include diff --git a/src/tests/create-dirs.c b/src/tests/create-dirs.c index 3566315d19..f48ce4979e 100644 --- a/src/tests/create-dirs.c +++ b/src/tests/create-dirs.c @@ -31,9 +31,8 @@ * SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include +#include #include #include diff --git a/src/tests/create-files.c b/src/tests/create-files.c index 96281c0ada..205a78d914 100644 --- a/src/tests/create-files.c +++ b/src/tests/create-files.c @@ -31,9 +31,8 @@ * SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include +#include #include #include diff --git a/src/tests/create-remove.c b/src/tests/create-remove.c index bc1352d33d..116f57dafc 100644 --- a/src/tests/create-remove.c +++ b/src/tests/create-remove.c @@ -31,9 +31,8 @@ * SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include +#include #include #include diff --git a/src/tests/create-stat.c b/src/tests/create-stat.c index a7a45607bd..85093b0800 100644 --- a/src/tests/create-stat.c +++ b/src/tests/create-stat.c @@ -32,10 +32,7 @@ */ #include - -#ifdef HAVE_CONFIG_H -#include -#endif +#include #include #include diff --git a/src/tests/create-symlinks.c b/src/tests/create-symlinks.c index 2efcd0e45b..441e713430 100644 --- a/src/tests/create-symlinks.c +++ b/src/tests/create-symlinks.c @@ -31,9 +31,8 @@ * SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include +#include #include #include diff --git a/src/tests/dup2-and-unlog.c b/src/tests/dup2-and-unlog.c index c3e05c5ddb..525734c2f0 100644 --- a/src/tests/dup2-and-unlog.c +++ b/src/tests/dup2-and-unlog.c @@ -1,6 +1,5 @@ -#ifdef HAVE_CONFIG_H -#include -#endif +#include +#include #include #include diff --git a/src/tests/echo-n.c b/src/tests/echo-n.c index 072b2ca882..00b0b29f73 100644 --- a/src/tests/echo-n.c +++ b/src/tests/echo-n.c @@ -1,6 +1,5 @@ -#ifdef HAVE_CONFIG_H -#include -#endif +#include +#include #include diff --git a/src/tests/err.c b/src/tests/err.c index c52b783872..e9168f731d 100644 --- a/src/tests/err.c +++ b/src/tests/err.c @@ -31,9 +31,8 @@ * SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include +#include #include "err.h" diff --git a/src/tests/errx.c b/src/tests/errx.c index e14305bbb9..2bc10bb733 100644 --- a/src/tests/errx.c +++ b/src/tests/errx.c @@ -31,9 +31,8 @@ * SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include +#include #include "err.h" diff --git a/src/tests/exit-wo-close.c b/src/tests/exit-wo-close.c index 7e9cd6fc27..3c745d1ffc 100644 --- a/src/tests/exit-wo-close.c +++ b/src/tests/exit-wo-close.c @@ -31,9 +31,8 @@ * SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include +#include #include #include diff --git a/src/tests/fchmod.c b/src/tests/fchmod.c index 1abbe0bf30..d77f20c361 100644 --- a/src/tests/fchmod.c +++ b/src/tests/fchmod.c @@ -31,9 +31,8 @@ * SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include +#include #include #include diff --git a/src/tests/fhbench.c b/src/tests/fhbench.c index dc7d0838b3..3d66dba905 100644 --- a/src/tests/fhbench.c +++ b/src/tests/fhbench.c @@ -31,9 +31,8 @@ * SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include +#include #include #include diff --git a/src/tests/fs_lib.c b/src/tests/fs_lib.c index 3c24928e05..f8024126fb 100644 --- a/src/tests/fs_lib.c +++ b/src/tests/fs_lib.c @@ -31,9 +31,8 @@ * SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include +#include #include #include diff --git a/src/tests/fsx.c b/src/tests/fsx.c index 479159cd5f..dcf0396273 100644 --- a/src/tests/fsx.c +++ b/src/tests/fsx.c @@ -9,6 +9,9 @@ * Rewritten 8/98 by Conrad Minshall. */ +#include +#include + #include #include #if defined(sun) || defined(_UWIN) || defined(__linux) diff --git a/src/tests/ga-test.c b/src/tests/ga-test.c index f0b9099023..d4713cfd1f 100644 --- a/src/tests/ga-test.c +++ b/src/tests/ga-test.c @@ -35,9 +35,8 @@ * Test if agetarg works as expected */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include +#include #include diff --git a/src/tests/hardlink1.c b/src/tests/hardlink1.c index 68703d3977..2eef46d4ec 100644 --- a/src/tests/hardlink1.c +++ b/src/tests/hardlink1.c @@ -31,9 +31,8 @@ * SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include +#include #include #include diff --git a/src/tests/hardlink2.c b/src/tests/hardlink2.c index ac162cb889..0da8b1d542 100644 --- a/src/tests/hardlink2.c +++ b/src/tests/hardlink2.c @@ -31,9 +31,8 @@ * SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include +#include #include #include diff --git a/src/tests/hardlink4.c b/src/tests/hardlink4.c index 1a44b2268c..d95603320f 100644 --- a/src/tests/hardlink4.c +++ b/src/tests/hardlink4.c @@ -31,9 +31,8 @@ * SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include +#include #include #include diff --git a/src/tests/intr-read.c b/src/tests/intr-read.c index 99a08f6ebf..7648236eab 100644 --- a/src/tests/intr-read.c +++ b/src/tests/intr-read.c @@ -31,9 +31,8 @@ * SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include +#include #include #include diff --git a/src/tests/invalidate-file.c b/src/tests/invalidate-file.c index 5ec8d245c7..791b6216a1 100644 --- a/src/tests/invalidate-file.c +++ b/src/tests/invalidate-file.c @@ -31,9 +31,8 @@ * SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include +#include #include #include diff --git a/src/tests/kill-softer.c b/src/tests/kill-softer.c index 5135de2e8c..c65cc92592 100644 --- a/src/tests/kill-softer.c +++ b/src/tests/kill-softer.c @@ -31,9 +31,8 @@ * SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include +#include #include #include diff --git a/src/tests/kill-softly.c b/src/tests/kill-softly.c index bcff95a03f..de73aed0e4 100644 --- a/src/tests/kill-softly.c +++ b/src/tests/kill-softly.c @@ -31,9 +31,8 @@ * SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include +#include #include #include diff --git a/src/tests/large-dir.c b/src/tests/large-dir.c index 98a59eef24..0778077e46 100644 --- a/src/tests/large-dir.c +++ b/src/tests/large-dir.c @@ -31,9 +31,8 @@ * SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include +#include #include #include diff --git a/src/tests/large-dir2.c b/src/tests/large-dir2.c index d2c2c84183..1c613676cb 100644 --- a/src/tests/large-dir2.c +++ b/src/tests/large-dir2.c @@ -31,9 +31,8 @@ * SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include +#include #include #include diff --git a/src/tests/large-dir3.c b/src/tests/large-dir3.c index f4671afab5..7863e89233 100644 --- a/src/tests/large-dir3.c +++ b/src/tests/large-dir3.c @@ -31,9 +31,8 @@ * SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include +#include #include #include diff --git a/src/tests/make-page.c b/src/tests/make-page.c index 37eaab285a..466f65134d 100644 --- a/src/tests/make-page.c +++ b/src/tests/make-page.c @@ -31,9 +31,8 @@ * SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include +#include #include #include diff --git a/src/tests/mkdir2.c b/src/tests/mkdir2.c index 4c6dcf449b..90b4bb9f6b 100644 --- a/src/tests/mkdir2.c +++ b/src/tests/mkdir2.c @@ -31,9 +31,8 @@ * SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include +#include #include #include diff --git a/src/tests/mkdir3.c b/src/tests/mkdir3.c index ce56fa2375..660fd5faaa 100644 --- a/src/tests/mkdir3.c +++ b/src/tests/mkdir3.c @@ -31,9 +31,8 @@ * SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include +#include #include #include diff --git a/src/tests/mmap-and-read.c b/src/tests/mmap-and-read.c index 8508625eea..341bbf2bfa 100644 --- a/src/tests/mmap-and-read.c +++ b/src/tests/mmap-and-read.c @@ -31,9 +31,8 @@ * SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include +#include #include #include diff --git a/src/tests/mmap-cat.c b/src/tests/mmap-cat.c index 7e78163a80..48cc691c8f 100644 --- a/src/tests/mmap-cat.c +++ b/src/tests/mmap-cat.c @@ -31,9 +31,8 @@ * SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include +#include #include #include diff --git a/src/tests/mmap-shared-write.c b/src/tests/mmap-shared-write.c index 94d11a1e68..730fcd2f8e 100644 --- a/src/tests/mmap-shared-write.c +++ b/src/tests/mmap-shared-write.c @@ -31,9 +31,8 @@ * SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include +#include #include #include diff --git a/src/tests/mmap-vs-read.c b/src/tests/mmap-vs-read.c index 8c01b43b47..7cb28dcb52 100644 --- a/src/tests/mmap-vs-read.c +++ b/src/tests/mmap-vs-read.c @@ -31,9 +31,8 @@ * SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include +#include #include #include diff --git a/src/tests/mmap-vs-read2.c b/src/tests/mmap-vs-read2.c index b91e0168dc..f583177369 100644 --- a/src/tests/mmap-vs-read2.c +++ b/src/tests/mmap-vs-read2.c @@ -31,9 +31,8 @@ * SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include +#include #include #include diff --git a/src/tests/null-search.c b/src/tests/null-search.c index 519c9efd4e..8a3f1efd1f 100644 --- a/src/tests/null-search.c +++ b/src/tests/null-search.c @@ -1,3 +1,6 @@ +#include +#include + #include #include #include diff --git a/src/tests/pine.c b/src/tests/pine.c index d2c512e423..a527155515 100644 --- a/src/tests/pine.c +++ b/src/tests/pine.c @@ -31,9 +31,8 @@ * SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include +#include #include #include diff --git a/src/tests/read-vs-mmap.c b/src/tests/read-vs-mmap.c index 9faef246c0..4734f1ef74 100644 --- a/src/tests/read-vs-mmap.c +++ b/src/tests/read-vs-mmap.c @@ -31,9 +31,8 @@ * SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include +#include #include #include diff --git a/src/tests/read-vs-mmap2.c b/src/tests/read-vs-mmap2.c index 11482cd12e..c22d31a52c 100644 --- a/src/tests/read-vs-mmap2.c +++ b/src/tests/read-vs-mmap2.c @@ -31,9 +31,8 @@ * SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include +#include #include #include diff --git a/src/tests/read-write.c b/src/tests/read-write.c index 73710833aa..cebe2dc83d 100644 --- a/src/tests/read-write.c +++ b/src/tests/read-write.c @@ -31,9 +31,8 @@ * SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include +#include #include #include diff --git a/src/tests/readdir-vs-lstat.c b/src/tests/readdir-vs-lstat.c index 5a9801123c..c93c366f04 100644 --- a/src/tests/readdir-vs-lstat.c +++ b/src/tests/readdir-vs-lstat.c @@ -31,9 +31,8 @@ * SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include +#include #include #include diff --git a/src/tests/rename-under-feet.c b/src/tests/rename-under-feet.c index 3b4d742680..269df653dc 100644 --- a/src/tests/rename-under-feet.c +++ b/src/tests/rename-under-feet.c @@ -31,9 +31,8 @@ * SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include +#include #include #include diff --git a/src/tests/rename5.c b/src/tests/rename5.c index 185f3c4b1d..1d299138d8 100644 --- a/src/tests/rename5.c +++ b/src/tests/rename5.c @@ -31,9 +31,8 @@ * SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include +#include #include #include diff --git a/src/tests/rename6.c b/src/tests/rename6.c index 83b177d1a3..176ee55e49 100644 --- a/src/tests/rename6.c +++ b/src/tests/rename6.c @@ -31,9 +31,8 @@ * SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include +#include #include #include diff --git a/src/tests/rm-rf.c b/src/tests/rm-rf.c index 2496f60feb..354fe0608d 100644 --- a/src/tests/rm-rf.c +++ b/src/tests/rm-rf.c @@ -31,9 +31,8 @@ * SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include +#include #include #include diff --git a/src/tests/still-there-p.c b/src/tests/still-there-p.c index 936f54e105..e69a703d72 100644 --- a/src/tests/still-there-p.c +++ b/src/tests/still-there-p.c @@ -31,9 +31,8 @@ * SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include +#include #include #include diff --git a/src/tests/strange-characters-c.c b/src/tests/strange-characters-c.c index 90e14dbe12..4518db6a38 100644 --- a/src/tests/strange-characters-c.c +++ b/src/tests/strange-characters-c.c @@ -31,9 +31,8 @@ * SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include +#include #include #include diff --git a/src/tests/symlink.c b/src/tests/symlink.c index b3a2a6946c..0f1986a60b 100644 --- a/src/tests/symlink.c +++ b/src/tests/symlink.c @@ -31,9 +31,8 @@ * SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include +#include #include #include diff --git a/src/tests/test-parallel1.c b/src/tests/test-parallel1.c index 0518964ae1..b950b869de 100644 --- a/src/tests/test-parallel1.c +++ b/src/tests/test-parallel1.c @@ -31,9 +31,8 @@ * SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include +#include #include #include diff --git a/src/tests/test-parallel2.c b/src/tests/test-parallel2.c index 0718cc4dfa..7299984629 100644 --- a/src/tests/test-parallel2.c +++ b/src/tests/test-parallel2.c @@ -31,9 +31,8 @@ * SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include +#include #include #include diff --git a/src/tests/test-setgroups.c b/src/tests/test-setgroups.c index 245664e3ad..a4f5734342 100644 --- a/src/tests/test-setgroups.c +++ b/src/tests/test-setgroups.c @@ -31,9 +31,8 @@ * SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include +#include #include #include diff --git a/src/tests/test-setpag.c b/src/tests/test-setpag.c index a4ff7d6930..fbc674b72c 100644 --- a/src/tests/test-setpag.c +++ b/src/tests/test-setpag.c @@ -31,9 +31,8 @@ * SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include +#include #include #include diff --git a/src/tests/truncate-files.c b/src/tests/truncate-files.c index 89574c89bb..a177510caa 100644 --- a/src/tests/truncate-files.c +++ b/src/tests/truncate-files.c @@ -31,9 +31,8 @@ * SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include +#include #include #include diff --git a/src/tests/truncate.c b/src/tests/truncate.c index f6c1b8fd90..c64ffeb4d4 100644 --- a/src/tests/truncate.c +++ b/src/tests/truncate.c @@ -31,9 +31,8 @@ * SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include +#include #include #include diff --git a/src/tests/utime-dir.c b/src/tests/utime-dir.c index 4103f2f981..4aa3ace92d 100644 --- a/src/tests/utime-dir.c +++ b/src/tests/utime-dir.c @@ -31,9 +31,8 @@ * SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include +#include #include #include diff --git a/src/tests/utime-file.c b/src/tests/utime-file.c index f102487599..afe40622c3 100644 --- a/src/tests/utime-file.c +++ b/src/tests/utime-file.c @@ -31,9 +31,8 @@ * SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include +#include #include #include diff --git a/src/tests/verr.c b/src/tests/verr.c index baebd76785..f10925c9b7 100644 --- a/src/tests/verr.c +++ b/src/tests/verr.c @@ -31,9 +31,8 @@ * SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include +#include #include diff --git a/src/tests/verrx.c b/src/tests/verrx.c index 682874577f..e1a43b68ba 100644 --- a/src/tests/verrx.c +++ b/src/tests/verrx.c @@ -31,9 +31,8 @@ * SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include +#include #include diff --git a/src/tests/vwarn.c b/src/tests/vwarn.c index 2511f96dfd..1846e7105d 100644 --- a/src/tests/vwarn.c +++ b/src/tests/vwarn.c @@ -31,9 +31,8 @@ * SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include +#include #include diff --git a/src/tests/vwarnx.c b/src/tests/vwarnx.c index c2447b4e6d..41986492f9 100644 --- a/src/tests/vwarnx.c +++ b/src/tests/vwarnx.c @@ -31,9 +31,8 @@ * SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include +#include #include diff --git a/src/tests/warn.c b/src/tests/warn.c index fb601bd691..1200daf967 100644 --- a/src/tests/warn.c +++ b/src/tests/warn.c @@ -31,9 +31,8 @@ * SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include +#include #include "err.h" diff --git a/src/tests/warnerr.c b/src/tests/warnerr.c index 84385fdcf0..b827432157 100644 --- a/src/tests/warnerr.c +++ b/src/tests/warnerr.c @@ -31,9 +31,8 @@ * SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include +#include #include "err.h" diff --git a/src/tests/warnx.c b/src/tests/warnx.c index e015407f18..b62edf2572 100644 --- a/src/tests/warnx.c +++ b/src/tests/warnx.c @@ -31,9 +31,8 @@ * SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include +#include #include "err.h" diff --git a/src/tests/write-closed.c b/src/tests/write-closed.c index 3b95c5db0a..cf47884300 100644 --- a/src/tests/write-closed.c +++ b/src/tests/write-closed.c @@ -31,9 +31,8 @@ * SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include +#include #include #include diff --git a/src/tests/write-closed2.c b/src/tests/write-closed2.c index 66df2e955b..68f359be93 100644 --- a/src/tests/write-closed2.c +++ b/src/tests/write-closed2.c @@ -34,10 +34,6 @@ #include #include -#ifdef HAVE_CONFIG_H -#include -#endif - #include #include #include diff --git a/src/tests/write-large.c b/src/tests/write-large.c index 7e9215ae74..aed5e0ce29 100644 --- a/src/tests/write-large.c +++ b/src/tests/write-large.c @@ -31,14 +31,13 @@ * SUCH DAMAGE. */ +#include +#include + #ifndef _LARGEFILE64_SOURCE # define _LARGEFILE64_SOURCE #endif -#ifdef HAVE_CONFIG_H -#include -#endif - #include #include diff --git a/src/tests/write-rand.c b/src/tests/write-rand.c index 2815f79421..8c92ed7bcc 100644 --- a/src/tests/write-rand.c +++ b/src/tests/write-rand.c @@ -31,9 +31,8 @@ * SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include +#include #include #include diff --git a/src/tests/write-ro-file.c b/src/tests/write-ro-file.c index 138d420fcb..aa0aa73178 100644 --- a/src/tests/write-ro-file.c +++ b/src/tests/write-ro-file.c @@ -31,9 +31,8 @@ * SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include +#include #include #include diff --git a/src/tests/write-ucc.c b/src/tests/write-ucc.c index 7541938340..433ef5d46c 100644 --- a/src/tests/write-ucc.c +++ b/src/tests/write-ucc.c @@ -31,9 +31,8 @@ * SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include +#include #include #include diff --git a/src/tests/write3.c b/src/tests/write3.c index e7dab34ff9..4698406b57 100644 --- a/src/tests/write3.c +++ b/src/tests/write3.c @@ -31,9 +31,8 @@ * SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include +#include #include