summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSami Kerola2015-01-07 20:44:26 +0100
committerSami Kerola2015-01-07 22:57:53 +0100
commit4ebac79f015c67aee373c0673496e72c01d18dbd (patch)
treee89fe41f78182da79d52dee009175ac9d65910fd
parentdocs: add howto-pull-request.txt (diff)
downloadkernel-qcow2-util-linux-4ebac79f015c67aee373c0673496e72c01d18dbd.tar.gz
kernel-qcow2-util-linux-4ebac79f015c67aee373c0673496e72c01d18dbd.tar.xz
kernel-qcow2-util-linux-4ebac79f015c67aee373c0673496e72c01d18dbd.zip
build-sys: fix make checkincludes warnings
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
-rw-r--r--configure.ac1
-rw-r--r--lib/blkdev.c12
-rw-r--r--term-utils/agetty.c7
3 files changed, 9 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac
index 871a5b7d3..a5bfc61fa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -220,6 +220,7 @@ AC_CHECK_HEADERS([ \
sys/ioccom.h \
sys/ioctl.h \
sys/mkdev.h \
+ sys/param.h \
sys/prctl.h \
sys/queue.h \
sys/resource.h \
diff --git a/lib/blkdev.c b/lib/blkdev.c
index a29352963..c4ebfaba0 100644
--- a/lib/blkdev.c
+++ b/lib/blkdev.c
@@ -19,14 +19,10 @@
#endif
#ifdef HAVE_SYS_DISK_H
-#ifdef HAVE_SYS_QUEUE_H
-#include <sys/queue.h> /* for LIST_HEAD */
-#endif
-#include <sys/disk.h>
-#endif
-
-#ifdef __FreeBSD_kernel__
-#include <sys/disk.h>
+# ifdef HAVE_SYS_QUEUE_H
+# include <sys/queue.h> /* for LIST_HEAD */
+# endif
+# include <sys/disk.h>
#endif
#include "blkdev.h"
diff --git a/term-utils/agetty.c b/term-utils/agetty.c
index 2ac0644df..1aafe72a1 100644
--- a/term-utils/agetty.c
+++ b/term-utils/agetty.c
@@ -45,15 +45,16 @@
#include "widechar.h"
#include "ttyutils.h"
+#ifdef HAVE_SYS_PARAM_H
+# include <sys/param.h>
+#endif
+
#if defined(__FreeBSD_kernel__)
#include <pty.h>
-#include <sys/param.h>
#endif
-
#ifdef __linux__
# include <sys/kd.h>
-# include <sys/param.h>
# define USE_SYSLOG
# ifndef DEFAULT_VCTERM
# define DEFAULT_VCTERM "linux"