From: Karel Zak <kzak@redhat.com>
Date: Wed, 20 Mar 2013 13:40:19 +0000 (+0100)
Subject: remove duplicate includes
X-Git-Tag: v2.23-rc1~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5ad0923904b60b41684728e2cc9a44e96b3eb0cd;p=thirdparty%2Futil-linux.git

remove duplicate includes

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/include/namespace.h b/include/namespace.h
index 9d58f13a51..9264302c66 100644
--- a/include/namespace.h
+++ b/include/namespace.h
@@ -23,8 +23,11 @@
 #  define CLONE_NEWPID 0x20000000
 # endif
 
-# ifndef HAVE_UNSHARE
+# if !defined(HAVE_UNSHARE) || !defined(HAVE_SETNS)
 #  include <sys/syscall.h>
+# endif
+
+# ifndef HAVE_UNSHARE
 static inline int unshare(int flags)
 {
 	return syscall(SYS_unshare, flags);
@@ -32,7 +35,6 @@ static inline int unshare(int flags)
 # endif
 
 # ifndef HAVE_SETNS
-#  include <sys/syscall.h>
 static inline int setns(int fd, int nstype)
 {
 	return syscall(SYS_setns, fd, nstype);
diff --git a/login-utils/sulogin-consoles.c b/login-utils/sulogin-consoles.c
index b519f7f250..305d1e7dcc 100644
--- a/login-utils/sulogin-consoles.c
+++ b/login-utils/sulogin-consoles.c
@@ -31,9 +31,10 @@
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #ifdef __linux__
-#  include <sys/vt.h>
-#  include <sys/kd.h>
-#  include <linux/serial.h>
+# include <sys/vt.h>
+# include <sys/kd.h>
+# include <linux/serial.h>
+# include <linux/major.h>
 #endif
 #include <fcntl.h>
 #include <dirent.h>
@@ -43,7 +44,6 @@
 # include <sys/mount.h>
 # include <linux/fs.h>
 # include <linux/magic.h>
-# include <linux/major.h>
 # ifndef MNT_DETACH
 #  define MNT_DETACH   2
 # endif
@@ -53,10 +53,6 @@
 #include "canonicalize.h"
 #include "sulogin-consoles.h"
 
-#ifdef __linux__
-# include <linux/major.h>
-#endif
-
 #if !defined(__STDC_VERSION__) || (__STDC_VERSION__ < 199901L)
 # ifndef  typeof
 #  define typeof		__typeof__
diff --git a/term-utils/agetty.c b/term-utils/agetty.c
index b9a14b3285..3c6307a216 100644
--- a/term-utils/agetty.c
+++ b/term-utils/agetty.c
@@ -28,7 +28,6 @@
 #include <time.h>
 #include <sys/file.h>
 #include <sys/socket.h>
-#include <netdb.h>
 #include <langinfo.h>
 #include <grp.h>
 #include <arpa/inet.h>