From: Joel Rosdahl <joel@rosdahl.net>
Date: Fri, 22 Jul 2016 16:21:44 +0000 (+0200)
Subject: Tweak #include file paths
X-Git-Tag: v3.3~42
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3c6eee543e8bbd2a567485c9b25e2801103488ea;p=thirdparty%2Fccache.git

Tweak #include file paths
---

diff --git a/counters.h b/counters.h
index 455237940..345302bda 100644
--- a/counters.h
+++ b/counters.h
@@ -19,6 +19,8 @@
 #ifndef COUNTERS_H
 #define COUNTERS_H
 
+#include <stddef.h>
+
 struct counters {
 	unsigned *data;   /* counter value */
 	size_t size;      /* logical array size */
diff --git a/language.h b/language.h
index 6f674d173..21f87e8cd 100644
--- a/language.h
+++ b/language.h
@@ -1,6 +1,8 @@
 #ifndef CCACHE_LANGUAGE_H
 #define CCACHE_LANGUAGE_H
 
+#include <stdbool.h>
+
 const char *language_for_file(const char *fname);
 const char *p_language_for_language(const char *language);
 const char *extension_for_language(const char *language);
diff --git a/macroskip.h b/macroskip.h
index cb32ec4dc..e06e7c9a7 100644
--- a/macroskip.h
+++ b/macroskip.h
@@ -1,3 +1,8 @@
+#ifndef CCACHE_MACROSKIP_H
+#define CCACHE_MACROSKIP_H
+
+#include <stdint.h>
+
 /*
  * A Boyer-Moore-Horspool skip table used for searching for the strings
  * "__TIME__" and "__DATE__".
@@ -54,3 +59,5 @@ static const uint32_t macro_skip[] = {
 	8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,
 	8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,
 };
+
+#endif
diff --git a/test/framework.c b/test/framework.c
index e232afef0..e4e6ac7b5 100644
--- a/test/framework.c
+++ b/test/framework.c
@@ -16,8 +16,8 @@
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "ccache.h"
-#include "test/framework.h"
+#include "../ccache.h"
+#include "framework.h"
 #include "util.h"
 
 #if defined(HAVE_TERMIOS_H)
diff --git a/test/framework.h b/test/framework.h
index fc9ff8df0..72c12f644 100644
--- a/test/framework.h
+++ b/test/framework.h
@@ -19,7 +19,7 @@
 #ifndef TEST_FRAMEWORK_H
 #define TEST_FRAMEWORK_H
 
-#include "ccache.h"
+#include "../ccache.h"
 
 /*****************************************************************************/
 
diff --git a/test/main.c b/test/main.c
index 75d641f72..aa4bf4008 100644
--- a/test/main.c
+++ b/test/main.c
@@ -17,11 +17,11 @@
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "test/framework.h"
+#include "framework.h"
 #ifdef HAVE_GETOPT_LONG
 #include <getopt.h>
 #else
-#include "getopt_long.h"
+#include "../getopt_long.h"
 #endif
 
 /* *INDENT-OFF* disable uncrustify */
@@ -43,7 +43,7 @@ main(int argc, char **argv)
 {
 	suite_fn suites[] = {
 #define SUITE(name) &suite_ ## name,
-#include "test/suites.h"
+#include "suites.h"
 #undef SUITE
 		NULL
 	};
diff --git a/test/test_args.c b/test/test_args.c
index 5a8a4707c..be0c7e736 100644
--- a/test/test_args.c
+++ b/test/test_args.c
@@ -20,9 +20,9 @@
  * This file contains tests for the functions operating on struct args.
  */
 
-#include "ccache.h"
-#include "test/framework.h"
-#include "test/util.h"
+#include "../ccache.h"
+#include "framework.h"
+#include "util.h"
 
 TEST_SUITE(args)
 
diff --git a/test/test_argument_processing.c b/test/test_argument_processing.c
index 001a68cea..7d61317e8 100644
--- a/test/test_argument_processing.c
+++ b/test/test_argument_processing.c
@@ -20,10 +20,10 @@
  * This file contains tests for the processing of compiler arguments.
  */
 
-#include "ccache.h"
-#include "conf.h"
-#include "test/framework.h"
-#include "test/util.h"
+#include "../ccache.h"
+#include "../conf.h"
+#include "framework.h"
+#include "util.h"
 
 extern struct conf *conf;
 
diff --git a/test/test_compopt.c b/test/test_compopt.c
index 6c17c3d33..3d0aa64de 100644
--- a/test/test_compopt.c
+++ b/test/test_compopt.c
@@ -20,9 +20,9 @@
  * This file contains tests for the compopt_* functions.
  */
 
-#include "ccache.h"
-#include "compopt.h"
-#include "test/framework.h"
+#include "../ccache.h"
+#include "../compopt.h"
+#include "framework.h"
 
 TEST_SUITE(compopt)
 
diff --git a/test/test_conf.c b/test/test_conf.c
index 1a8749a59..e2de4e909 100644
--- a/test/test_conf.c
+++ b/test/test_conf.c
@@ -16,9 +16,9 @@
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "conf.h"
-#include "test/framework.h"
-#include "test/util.h"
+#include "../conf.h"
+#include "framework.h"
+#include "util.h"
 
 #define N_CONFIG_ITEMS 30
 static struct {
diff --git a/test/test_counters.c b/test/test_counters.c
index df12a8b59..37e26fc75 100644
--- a/test/test_counters.c
+++ b/test/test_counters.c
@@ -16,10 +16,10 @@
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "ccache.h"
-#include "counters.h"
-#include "test/framework.h"
-#include "test/util.h"
+#include "../ccache.h"
+#include "../counters.h"
+#include "framework.h"
+#include "util.h"
 
 TEST_SUITE(counters)
 
diff --git a/test/test_hash.c b/test/test_hash.c
index 46f65db97..7042ca3c0 100644
--- a/test/test_hash.c
+++ b/test/test_hash.c
@@ -20,8 +20,8 @@
  * This file contains tests for functions in hash.c.
  */
 
-#include "ccache.h"
-#include "test/framework.h"
+#include "../ccache.h"
+#include "framework.h"
 
 TEST_SUITE(hash)
 
diff --git a/test/test_hashutil.c b/test/test_hashutil.c
index aa77066f4..f92597a63 100644
--- a/test/test_hashutil.c
+++ b/test/test_hashutil.c
@@ -20,10 +20,10 @@
  * This file contains tests for functions in hashutil.c.
  */
 
-#include "ccache.h"
-#include "hashutil.h"
-#include "test/framework.h"
-#include "test/util.h"
+#include "../ccache.h"
+#include "../hashutil.h"
+#include "framework.h"
+#include "util.h"
 
 TEST_SUITE(hashutil)
 
diff --git a/test/test_lockfile.c b/test/test_lockfile.c
index 9af995f97..e7a6742d2 100644
--- a/test/test_lockfile.c
+++ b/test/test_lockfile.c
@@ -20,9 +20,9 @@
  * This file contains tests for functions in lockfile.c.
  */
 
-#include "ccache.h"
-#include "test/framework.h"
-#include "test/util.h"
+#include "../ccache.h"
+#include "framework.h"
+#include "util.h"
 
 TEST_SUITE(lockfile)
 
diff --git a/test/test_stats.c b/test/test_stats.c
index 79482d104..a8abad378 100644
--- a/test/test_stats.c
+++ b/test/test_stats.c
@@ -20,10 +20,10 @@
  * This file contains tests for statistics handling.
  */
 
-#include "ccache.h"
-#include "counters.h"
-#include "test/framework.h"
-#include "test/util.h"
+#include "../ccache.h"
+#include "../counters.h"
+#include "framework.h"
+#include "util.h"
 
 TEST_SUITE(stats)
 
diff --git a/test/test_util.c b/test/test_util.c
index 3842fab30..89bbb935c 100644
--- a/test/test_util.c
+++ b/test/test_util.c
@@ -20,8 +20,8 @@
  * This file contains tests for functions in util.c.
  */
 
-#include "ccache.h"
-#include "test/framework.h"
+#include "../ccache.h"
+#include "framework.h"
 
 TEST_SUITE(util)
 
diff --git a/test/util.c b/test/util.c
index 49c079cbb..ba91f072c 100644
--- a/test/util.c
+++ b/test/util.c
@@ -16,8 +16,8 @@
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "system.h"
-#include "test/util.h"
+#include "../system.h"
+#include "util.h"
 
 #ifdef _WIN32
 #    define lstat(a, b) stat(a, b)
diff --git a/test/util.h b/test/util.h
index dd942d453..23636b932 100644
--- a/test/util.h
+++ b/test/util.h
@@ -1,6 +1,8 @@
 #ifndef TEST_UTIL_H
 #define TEST_UTIL_H
 
+#include <stdbool.h>
+
 bool path_exists(const char *path);
 bool is_symlink(const char *path);
 void create_file(const char *path, const char *content);