From: Joel Rosdahl <joel@rosdahl.net>
Date: Wed, 17 Feb 2010 19:53:05 +0000 (+0100)
Subject: Remove standard includes from ccache.h
X-Git-Tag: v3.0pre0~85
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ecf85fc492366c9ee7db9fef060972971f6ad698;p=thirdparty%2Fccache.git

Remove standard includes from ccache.h
---

diff --git a/args.c b/args.c
index f629640f0..53939bde2 100644
--- a/args.c
+++ b/args.c
@@ -20,6 +20,9 @@
 
 #include "ccache.h"
 
+#include <stdlib.h>
+#include <string.h>
+
 ARGS *args_init(int init_argc, char **init_args)
 {
 	ARGS *args;
diff --git a/ccache.c b/ccache.c
index bae314436..5ed438887 100644
--- a/ccache.c
+++ b/ccache.c
@@ -30,6 +30,14 @@
 #include "manifest.h"
 #include "comments.h"
 
+#include <sys/mman.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <time.h>
+#include <unistd.h>
+
 /* current working directory taken from $PWD, or getcwd() if $PWD is bad */
 char *current_working_dir;
 
diff --git a/ccache.h b/ccache.h
index a44f866dd..41b5ff0e3 100644
--- a/ccache.h
+++ b/ccache.h
@@ -4,32 +4,9 @@
 #define CCACHE_VERSION "3.0pre0"
 
 #include "config.h"
+#include "mdfour.h"
 
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-#include <sys/mman.h>
-#include <fcntl.h>
-#include <time.h>
-#include <string.h>
-#include <ctype.h>
-#include <utime.h>
-#include <stdarg.h>
-#include <dirent.h>
-#include <limits.h>
 #include <sys/file.h>
-#ifdef HAVE_PWD_H
-#include <pwd.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-
-#include <zlib.h>
 
 #ifdef __GNUC__
 #define ATTR_FORMAT(x, y, z) __attribute__((format (x, y, z)))
@@ -81,8 +58,6 @@ enum stats {
 	STATS_END
 };
 
-#include "mdfour.h"
-
 void hash_start(struct mdfour *md);
 void hash_string(struct mdfour *md, const char *s);
 void hash_int(struct mdfour *md, int x);
diff --git a/cleanup.c b/cleanup.c
index 170b625d6..98e62d960 100644
--- a/cleanup.c
+++ b/cleanup.c
@@ -21,6 +21,13 @@
 
 #include "ccache.h"
 
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <time.h>
+
 static struct files {
 	char *fname;
 	time_t mtime;
diff --git a/comments.c b/comments.c
index daf9d8f6d..378d0d721 100644
--- a/comments.c
+++ b/comments.c
@@ -19,6 +19,9 @@
 #include "ccache.h"
 #include "comments.h"
 
+#include <unistd.h>
+#include <sys/mman.h>
+
 #define HASH(ch)							\
 	do {								\
 		hashbuf[hashbuflen] = ch;				\
diff --git a/execute.c b/execute.c
index 3f936ea33..ec170a4f5 100644
--- a/execute.c
+++ b/execute.c
@@ -18,6 +18,12 @@
 
 #include "ccache.h"
 
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <unistd.h>
 
 /*
   execute a compiler backend, capturing all output to the given paths
diff --git a/hash.c b/hash.c
index 89addc452..f63cfae97 100644
--- a/hash.c
+++ b/hash.c
@@ -20,7 +20,10 @@
 */
 
 #include "ccache.h"
+
 #include <stdio.h>
+#include <string.h>
+#include <unistd.h>
 
 void hash_buffer(struct mdfour *md, const char *s, int len)
 {
diff --git a/manifest.c b/manifest.c
index 3265e87cf..32779ce7f 100644
--- a/manifest.c
+++ b/manifest.c
@@ -16,21 +16,23 @@
  * Ave, Cambridge, MA 02139, USA.
  */
 
+#include "ccache.h"
+#include "hashtable_itr.h"
+#include "hashutil.h"
+#include "manifest.h"
+#include "murmurhashneutral2.h"
+#include "comments.h"
+
 #include <assert.h>
 #include <inttypes.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <zlib.h>
 
-#include "ccache.h"
-#include "hashtable_itr.h"
-#include "hashutil.h"
-#include "manifest.h"
-#include "murmurhashneutral2.h"
-#include "comments.h"
-
 /*
  * Sketchy specification of the manifest disk format:
  *
diff --git a/mdfour.c b/mdfour.c
index 3091cc3ae..581865b9b 100644
--- a/mdfour.c
+++ b/mdfour.c
@@ -19,6 +19,8 @@
 
 #include "ccache.h"
 
+#include <string.h>
+
 /* NOTE: This code makes no attempt to be fast!
 
    It assumes that a int is at least 32 bits long
diff --git a/stats.c b/stats.c
index 90cd1ca9e..80211897f 100644
--- a/stats.c
+++ b/stats.c
@@ -24,6 +24,11 @@
 
 #include "ccache.h"
 
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
 extern char *stats_file;
 extern char *cache_dir;
 
diff --git a/unify.c b/unify.c
index f4161c78b..a5611c195 100644
--- a/unify.c
+++ b/unify.c
@@ -32,6 +32,11 @@
 
 #include "ccache.h"
 
+#include <sys/mman.h>
+#include <ctype.h>
+#include <string.h>
+#include <unistd.h>
+
 static char *s_tokens[] = {
 	"...",	">>=",	"<<=",	"+=",	"-=",	"*=",	"/=",	"%=",	"&=",	"^=",
 	"|=",	">>",	"<<",	"++",	"--",	"->",	"&&",	"||",	"<=",	">=",
diff --git a/util.c b/util.c
index 564095159..1da2e3af5 100644
--- a/util.c
+++ b/util.c
@@ -18,6 +18,24 @@
 
 #include "ccache.h"
 
+#include <ctype.h>
+#include <sys/types.h>
+#include <stdarg.h>
+#include <dirent.h>
+#include <utime.h>
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <zlib.h>
+
+#ifdef HAVE_PWD_H
+#include <pwd.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+
 static FILE *logfile;
 
 /* log a message to the CCACHE_LOGFILE location */