[gentoo-commits] proj/portage-utils:master commit in: /

[Mike Frysinger]

commit:     d2341937bd97afa24f09742f0ccf5e5e3bf053d3
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 28 02:58:12 2016 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Mon Mar 28 02:58:12 2016 +0000
URL:        https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=d2341937

qlop: drop redundant headers

These are already pulled in via porting.h.

 qlop.c | 26 +++++++-------------------
 1 file changed, 7 insertions(+), 19 deletions(-)

diff --git a/qlop.c b/qlop.c
index ad62474..319d767 100644
--- a/qlop.c
+++ b/qlop.c
@@ -8,24 +8,6 @@
 
 #ifdef APPLET_qlop
 
-#ifdef __linux__
-# include <asm/param.h>
-#endif
-
-#ifdef __FreeBSD__
-# include <kvm.h>
-# include <sys/param.h>
-# include <sys/sysctl.h>
-# include <sys/user.h>
-# include <sys/time.h>
-#endif
-
-#ifdef __MACH__
-# include <stdlib.h>
-# include <sys/types.h>
-# include <sys/sysctl.h>
-#endif
-
 #define QLOP_DEFAULT_LOGFILE "emerge.log"
 
 #define QLOP_FLAGS "gtHluscf:" COMMON_FLAGS
@@ -379,7 +361,8 @@ show_sync_history(const char *logfile)
 
 _q_static void show_current_emerge(void);
 #ifdef __linux__
-#include <elf.h>
+# include <asm/param.h>
+# include <elf.h>
 static unsigned long hz = 0;
 static void init_hz(void)
 {
@@ -495,6 +478,10 @@ void show_current_emerge(void)
                puts("No emerge processes located");
 }
 #elif defined(__FreeBSD__)
+# include <kvm.h>
+# include <sys/param.h>
+# include <sys/sysctl.h>
+# include <sys/user.h>
 void show_current_emerge(void)
 {
        kvm_t *kd = NULL;
@@ -545,6 +532,7 @@ void show_current_emerge(void)
                puts("No emerge processes located");
 }
 #elif defined(__MACH__)
+# include <sys/sysctl.h>
 void show_current_emerge(void)
 {
        int mib[3];