1 |
commit: d2341937bd97afa24f09742f0ccf5e5e3bf053d3 |
2 |
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Mar 28 02:58:12 2016 +0000 |
4 |
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Mar 28 02:58:12 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=d2341937 |
7 |
|
8 |
qlop: drop redundant headers |
9 |
|
10 |
These are already pulled in via porting.h. |
11 |
|
12 |
qlop.c | 26 +++++++------------------- |
13 |
1 file changed, 7 insertions(+), 19 deletions(-) |
14 |
|
15 |
diff --git a/qlop.c b/qlop.c |
16 |
index ad62474..319d767 100644 |
17 |
--- a/qlop.c |
18 |
+++ b/qlop.c |
19 |
@@ -8,24 +8,6 @@ |
20 |
|
21 |
#ifdef APPLET_qlop |
22 |
|
23 |
-#ifdef __linux__ |
24 |
-# include <asm/param.h> |
25 |
-#endif |
26 |
- |
27 |
-#ifdef __FreeBSD__ |
28 |
-# include <kvm.h> |
29 |
-# include <sys/param.h> |
30 |
-# include <sys/sysctl.h> |
31 |
-# include <sys/user.h> |
32 |
-# include <sys/time.h> |
33 |
-#endif |
34 |
- |
35 |
-#ifdef __MACH__ |
36 |
-# include <stdlib.h> |
37 |
-# include <sys/types.h> |
38 |
-# include <sys/sysctl.h> |
39 |
-#endif |
40 |
- |
41 |
#define QLOP_DEFAULT_LOGFILE "emerge.log" |
42 |
|
43 |
#define QLOP_FLAGS "gtHluscf:" COMMON_FLAGS |
44 |
@@ -379,7 +361,8 @@ show_sync_history(const char *logfile) |
45 |
|
46 |
_q_static void show_current_emerge(void); |
47 |
#ifdef __linux__ |
48 |
-#include <elf.h> |
49 |
+# include <asm/param.h> |
50 |
+# include <elf.h> |
51 |
static unsigned long hz = 0; |
52 |
static void init_hz(void) |
53 |
{ |
54 |
@@ -495,6 +478,10 @@ void show_current_emerge(void) |
55 |
puts("No emerge processes located"); |
56 |
} |
57 |
#elif defined(__FreeBSD__) |
58 |
+# include <kvm.h> |
59 |
+# include <sys/param.h> |
60 |
+# include <sys/sysctl.h> |
61 |
+# include <sys/user.h> |
62 |
void show_current_emerge(void) |
63 |
{ |
64 |
kvm_t *kd = NULL; |
65 |
@@ -545,6 +532,7 @@ void show_current_emerge(void) |
66 |
puts("No emerge processes located"); |
67 |
} |
68 |
#elif defined(__MACH__) |
69 |
+# include <sys/sysctl.h> |
70 |
void show_current_emerge(void) |
71 |
{ |
72 |
int mib[3]; |