Tweak #include file paths

diff --git a/counters.h b/counters.h
index 455237940c1507843bcc30ab41d6e8bb2a6ae1c7..345302bda83a9a9fd89f99411e3770adbae6d945 100644 (file)
--- 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 6f674d173cde797c5526031c9b62e4b22f96f781..21f87e8cd5a1d7990e831e0147cff82705a1a440 100644 (file)
--- 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 cb32ec4dcf3785d31fdca96eedefdf6c1268ea83..e06e7c9a7827ee1c77c32c13eaed1eabd73e4ba0 100644 (file)
--- 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 e232afef0eaa391fbdc6aae73854dddc242f5ce5..e4e6ac7b50cbd3a9e9b85cbb55ccd472a1dbf751 100644 (file)
--- 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 fc9ff8df06c6cae68432933429a68e28fe8ed093..72c12f6443d29abd29a9e8b09fa49af9d688b448 100644 (file)
--- 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 75d641f72a85ae8bc81156be8c78be22b9ae0be4..aa4bf400866eeb1a2687ae4c71b85e63cb715f4f 100644 (file)
--- 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 5a8a4707c7caec719515ac5063bb8866c66d1789..be0c7e736ced35d2d08ff99c1d7cd67c2788d6c1 100644 (file)
--- 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 001a68cea68e0bb1ebf0adb810b7e863897544d8..7d61317e85518eedfc94c72f5faa0bbc01c128e1 100644 (file)
--- 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 6c17c3d337c03e466b158fd6f81796a33f06f4e0..3d0aa64de6c0fcbe48680598616694bef89b7fd6 100644 (file)
--- 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 1a8749a59d181614817f8213e03754e486601022..e2de4e9090d218f78b1f1c3125b79480719bc640 100644 (file)
--- 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 df12a8b59817a79afea094b4da3fd64be8c987bb..37e26fc75798ed03726e342e1c19578e9f2ea903 100644 (file)
--- 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 46f65db9731949507adcc4fab66c4e5db2c58c5f..7042ca3c0c870379e180a593ff8262dcc8556ead 100644 (file)
--- 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 aa77066f48cb1dfd1328b0132946e85cdef38d26..f92597a6338032d5e325577b35e09310f217f93c 100644 (file)
--- 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 9af995f973b6bcc8ccdb1b7bea2d62b765b94422..e7a6742d27b25564c37d19d33d2491ce1b5e61ae 100644 (file)
--- 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 79482d104012d6ca4c1e658c6ffbde8d835921a2..a8abad378607dcfd2ac0e78c30319342f17ba5bc 100644 (file)
--- 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 3842fab3075f9e547c3c0473246b7dea1215ee18..89bbb935c30310e585576aeeebc430ee39ed845b 100644 (file)
--- 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 49c079cbb0e2e6f9c984b6481eddbb2d726809d4..ba91f072c1a80b6438ea0c9fd11ee4c419ded46f 100644 (file)
--- 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 dd942d453d89684c2b64fa837e24e7fae4845458..23636b9328de13e042954fc7e1dea7dfb0dd248b 100644 (file)
--- 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);