| 1 |
commit: d6d33b2ef60f3700702e59f8cdf718b7dd3fb886 |
| 2 |
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Dec 28 22:33:45 2016 +0000 |
| 4 |
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Dec 28 22:33:45 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=d6d33b2e |
| 7 |
|
| 8 |
move system headers to porting.h to avoid duplication |
| 9 |
|
| 10 |
porting.h | 3 +++ |
| 11 |
qcache.c | 10 ---------- |
| 12 |
qmerge.c | 3 --- |
| 13 |
qpkg.c | 2 -- |
| 14 |
4 files changed, 3 insertions(+), 15 deletions(-) |
| 15 |
|
| 16 |
diff --git a/porting.h b/porting.h |
| 17 |
index 28b6317..b166bc1 100644 |
| 18 |
--- a/porting.h |
| 19 |
+++ b/porting.h |
| 20 |
@@ -30,7 +30,10 @@ |
| 21 |
#include <ctype.h> |
| 22 |
#include <dirent.h> |
| 23 |
#include <errno.h> |
| 24 |
+#include <fcntl.h> |
| 25 |
+#include <fnmatch.h> |
| 26 |
#include <getopt.h> |
| 27 |
+#include <glob.h> |
| 28 |
#include <inttypes.h> |
| 29 |
#include <libgen.h> |
| 30 |
#include <limits.h> |
| 31 |
|
| 32 |
diff --git a/qcache.c b/qcache.c |
| 33 |
index 535d7a2..c5421c7 100644 |
| 34 |
--- a/qcache.c |
| 35 |
+++ b/qcache.c |
| 36 |
@@ -7,16 +7,6 @@ |
| 37 |
|
| 38 |
#ifdef APPLET_qcache |
| 39 |
|
| 40 |
-#include <dirent.h> |
| 41 |
-#include <fcntl.h> |
| 42 |
-#include <stdio.h> |
| 43 |
-#include <stdlib.h> |
| 44 |
-#include <string.h> |
| 45 |
-#include <sys/types.h> |
| 46 |
-#include <sys/stat.h> |
| 47 |
-#include <time.h> |
| 48 |
-#include <unistd.h> |
| 49 |
- |
| 50 |
/********************************************************************/ |
| 51 |
/* Required portage-utils stuff */ |
| 52 |
/********************************************************************/ |
| 53 |
|
| 54 |
diff --git a/qmerge.c b/qmerge.c |
| 55 |
index 68459c9..4ef156b 100644 |
| 56 |
--- a/qmerge.c |
| 57 |
+++ b/qmerge.c |
| 58 |
@@ -8,9 +8,6 @@ |
| 59 |
|
| 60 |
#ifdef APPLET_qmerge |
| 61 |
|
| 62 |
-#include <fnmatch.h> |
| 63 |
-#include <glob.h> |
| 64 |
-#include <sys/stat.h> |
| 65 |
/* This is a GNUlib hack, because GNUlib doesn't provide st_mtim members |
| 66 |
* of struct stat, but instead provides wrappers to retrieve the time |
| 67 |
* fields (stat-time module). We just define a macro in case people are |
| 68 |
|
| 69 |
diff --git a/qpkg.c b/qpkg.c |
| 70 |
index 2cc658e..1c18edc 100644 |
| 71 |
--- a/qpkg.c |
| 72 |
+++ b/qpkg.c |
| 73 |
@@ -8,8 +8,6 @@ |
| 74 |
|
| 75 |
#ifdef APPLET_qpkg |
| 76 |
|
| 77 |
-#include <fnmatch.h> |
| 78 |
- |
| 79 |
#define QPKG_FLAGS "cEpP:" COMMON_FLAGS |
| 80 |
static struct option const qpkg_long_opts[] = { |
| 81 |
{"clean", no_argument, NULL, 'c'}, |
Archives