diff options
| author |   nicm <nicm@openbsd.org> | 2016-05-01 20:34:26 +0000 |
|---|---|---|
| committer | nicm <nicm@openbsd.org> | 2016-05-01 20:34:26 +0000 |
| commit | 1da77805bdfaebfa7cde34b36b3c9dc3499534d0 (patch) | |
| tree | ff5e9c3278c9b1cd0d01cff6d5bf8c5b03ea6de7 | |
| parent | Add bus width switching support for MMC. Enable 8-bit bus support on (diff) | |
| download | wireguard-openbsd-1da77805bdfaebfa7cde34b36b3c9dc3499534d0.tar.xz wireguard-openbsd-1da77805bdfaebfa7cde34b36b3c9dc3499534d0.zip | |
Tidy up some #include lines.
| -rw-r--r-- | usr.bin/file/file.c | 14 | ||||
| -rw-r--r-- | usr.bin/file/magic.h | 7 |
2 files changed, 11 insertions, 10 deletions
diff --git a/usr.bin/file/file.c b/usr.bin/file/file.c index d6987e32f2a..66709054a92 100644 --- a/usr.bin/file/file.c +++ b/usr.bin/file/file.c @@ -1,4 +1,4 @@ -/* $OpenBSD: file.c,v 1.57 2015/12/24 11:45:34 jca Exp $ */ +/* $OpenBSD: file.c,v 1.58 2016/05/01 20:34:26 nicm Exp $ */ /* * Copyright (c) 2015 Nicholas Marriott <nicm@openbsd.org> @@ -19,21 +19,25 @@ #include <sys/types.h> #include <sys/ioctl.h> #include <sys/mman.h> -#include <sys/socket.h> #include <sys/queue.h> +#include <sys/socket.h> +#include <sys/stat.h> #include <sys/uio.h> #include <sys/wait.h> +#include <err.h> #include <errno.h> +#include <fcntl.h> +#include <getopt.h> #include <imsg.h> #include <libgen.h> -#include <getopt.h> -#include <fcntl.h> +#include <limits.h> #include <pwd.h> #include <stdlib.h> +#include <stdlib.h> +#include <string.h> #include <time.h> #include <unistd.h> -#include <limits.h> #include "file.h" #include "magic.h" diff --git a/usr.bin/file/magic.h b/usr.bin/file/magic.h index cd458181f04..1fd8c96290c 100644 --- a/usr.bin/file/magic.h +++ b/usr.bin/file/magic.h @@ -1,4 +1,4 @@ -/* $OpenBSD: magic.h,v 1.14 2016/05/01 10:56:03 nicm Exp $ */ +/* $OpenBSD: magic.h,v 1.15 2016/05/01 20:34:26 nicm Exp $ */ /* * Copyright (c) 2015 Nicholas Marriott <nicm@openbsd.org> @@ -19,16 +19,13 @@ #ifndef MAGIC_H #define MAGIC_H +#include <sys/types.h> #include <sys/tree.h> #include <sys/queue.h> -#include <sys/stat.h> -#include <err.h> #include <regex.h> #include <stdio.h> #include <stdarg.h> -#include <stdlib.h> -#include <string.h> #define MAGIC_STRING_SIZE 31 #define MAGIC_STRENGTH_MULTIPLIER 10 |