From: Ruediger Meier <ruediger.meier@ga-group.nl>
Date: Mon, 22 Feb 2016 16:25:21 +0000 (+0100)
Subject: misc: fix some includes
X-Git-Tag: v2.28-rc1~64^2~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eaac9f88f9020701496f704f940cb96c97bc4e6a;p=thirdparty%2Futil-linux.git

misc: fix some includes

features.h:  any glibc header includes this already
libgen.h:    was unused there
sys/uio.h:   for writev(3p)
sys/queue.h  seems like it was never used

Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
---

diff --git a/configure.ac b/configure.ac
index 7b6a9e725b..63d1d38a23 100644
--- a/configure.ac
+++ b/configure.ac
@@ -242,7 +242,6 @@ AC_CHECK_HEADERS([ \
 	sys/mount.h \
 	sys/param.h \
 	sys/prctl.h \
-	sys/queue.h \
 	sys/resource.h \
 	sys/socket.h \
 	sys/sockio.h \
diff --git a/lib/blkdev.c b/lib/blkdev.c
index 403e9e48a2..8a5a52dfa2 100644
--- a/lib/blkdev.c
+++ b/lib/blkdev.c
@@ -19,9 +19,6 @@
 #endif
 
 #ifdef HAVE_SYS_DISK_H
-# ifdef HAVE_SYS_QUEUE_H
-#  include <sys/queue.h>	/* for LIST_HEAD */
-# endif
 # include <sys/disk.h>
 #endif
 
diff --git a/misc-utils/logger.c b/misc-utils/logger.c
index d9aee0eb9c..896d1b8c07 100644
--- a/misc-utils/logger.c
+++ b/misc-utils/logger.c
@@ -53,6 +53,7 @@
 #include <pwd.h>
 #include <sys/types.h>
 #include <signal.h>
+#include <sys/uio.h>
 
 #include "all-io.h"
 #include "c.h"
diff --git a/misc-utils/test_uuidd.c b/misc-utils/test_uuidd.c
index 1262e359d7..78399b91f0 100644
--- a/misc-utils/test_uuidd.c
+++ b/misc-utils/test_uuidd.c
@@ -24,7 +24,6 @@
  *	make uuidd uuidgen localstatedir=/var
  */
 #include <error.h>
-#include <libgen.h>
 #include <pthread.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/sys-utils/ipcs.c b/sys-utils/ipcs.c
index 5877c46b17..0ebcc4c62a 100644
--- a/sys-utils/ipcs.c
+++ b/sys-utils/ipcs.c
@@ -16,7 +16,6 @@
  */
 
 #include <errno.h>
-#include <features.h>
 #include <getopt.h>
 
 #include "c.h"
diff --git a/sys-utils/lsipc.c b/sys-utils/lsipc.c
index 9e34e6b592..938728ada0 100644
--- a/sys-utils/lsipc.c
+++ b/sys-utils/lsipc.c
@@ -25,7 +25,6 @@
  */
 
 #include <errno.h>
-#include <features.h>
 #include <getopt.h>
 #include <sys/time.h>
 #include <unistd.h>
diff --git a/sys-utils/rtcwake.c b/sys-utils/rtcwake.c
index 842ea509cb..7c748dcc5c 100644
--- a/sys-utils/rtcwake.c
+++ b/sys-utils/rtcwake.c
@@ -22,7 +22,6 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <getopt.h>
-#include <libgen.h>
 #include <linux/rtc.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/text-utils/pg.c b/text-utils/pg.c
index 998010ad2f..9ef00f0342 100644
--- a/text-utils/pg.c
+++ b/text-utils/pg.c
@@ -58,7 +58,6 @@
 #include <unistd.h>
 #include <signal.h>
 #include <setjmp.h>
-#include <libgen.h>
 
 #ifdef HAVE_NCURSES_H
 # include <ncurses.h>