build-sys: fix make checkincludes warnings

Signed-off-by: Sami Kerola <kerolasa@iki.fi>

diff --git a/configure.ac b/configure.ac
index 871a5b7d37719198ea810b1b9a8422cd92674781..a5bfc61fab7d8d4ebda7175ab2443fb89822e771 100644 (file)
--- 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 a293529631cbe4218dc2a149d8e1176da306eed1..c4ebfaba002df0b3cd8a87a9e16cca89a6a2bed5 100644 (file)
--- 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 2ac0644dfe96686952312279210992fbd9285f62..1aafe72a1602b82883fb9828c6d26f8aeeda4bfa 100644 (file)
--- 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"