diff --git a/doc/github_commits.c b/doc/github_commits.c index 81c80639..979e2fbe 100644 --- a/doc/github_commits.c +++ b/doc/github_commits.c @@ -9,7 +9,7 @@ #include #include -#include +#include "jansson.h" #define BUFFER_SIZE (256 * 1024) /* 256 KB */ diff --git a/examples/simple_parse.c b/examples/simple_parse.c index a96a0f83..b8ebc6cc 100644 --- a/examples/simple_parse.c +++ b/examples/simple_parse.c @@ -22,7 +22,7 @@ * it under the terms of the MIT license. See LICENSE for details. */ -#include +#include "jansson.h" #include #include diff --git a/src/dump.c b/src/dump.c index 28ff692e..a95bef9f 100644 --- a/src/dump.c +++ b/src/dump.c @@ -19,7 +19,9 @@ #include #endif +#include "hashtable.h" #include "jansson.h" +#include "jansson_config.h" #include "strbuffer.h" #include "utf.h" diff --git a/src/error.c b/src/error.c index 14d0047d..a37cb15b 100644 --- a/src/error.c +++ b/src/error.c @@ -1,4 +1,7 @@ +#include "jansson.h" #include "jansson_private.h" +#include +#include #include void jsonp_error_init(json_error_t *error, const char *source) { diff --git a/src/hashtable.c b/src/hashtable.c index 5e97f851..a265036b 100644 --- a/src/hashtable.c +++ b/src/hashtable.c @@ -6,7 +6,7 @@ */ #ifdef HAVE_CONFIG_H -#include +#include "jansson_private_config.h" #endif #include @@ -18,7 +18,7 @@ #include "hashtable.h" #include "jansson_private.h" /* for container_of() */ -#include /* for JSON_INLINE */ +#include "jansson_config.h" /* for JSON_INLINE */ #ifndef INITIAL_HASHTABLE_ORDER #define INITIAL_HASHTABLE_ORDER 3 diff --git a/src/hashtable_seed.c b/src/hashtable_seed.c index d156b400..e558b3c4 100644 --- a/src/hashtable_seed.c +++ b/src/hashtable_seed.c @@ -3,7 +3,7 @@ */ #ifdef HAVE_CONFIG_H -#include +#include "jansson_private_config.h" #endif #include @@ -42,8 +42,6 @@ #include #endif -#include "jansson.h" - static uint32_t buf_to_uint32(char *data) { size_t i; uint32_t result = 0; diff --git a/src/load.c b/src/load.c index 8ae7abd1..83200e51 100644 --- a/src/load.c +++ b/src/load.c @@ -9,13 +9,13 @@ #define _GNU_SOURCE #endif +#include "jansson_config.h" #include "jansson_private.h" #include #include -#include +#include #include -#include #include #ifdef HAVE_UNISTD_H #include diff --git a/src/lookup3.h b/src/lookup3.h index 9b39aa1c..517f51ef 100644 --- a/src/lookup3.h +++ b/src/lookup3.h @@ -38,7 +38,7 @@ on 1 byte), but shoehorning those bytes into integers efficiently is messy. #include #ifdef HAVE_CONFIG_H -#include +#include "jansson_private_config.h" #endif #ifdef HAVE_STDINT_H diff --git a/src/pack_unpack.c b/src/pack_unpack.c index a796ed4f..c0299dc2 100644 --- a/src/pack_unpack.c +++ b/src/pack_unpack.c @@ -7,8 +7,12 @@ */ #include "jansson.h" +#include "jansson_config.h" #include "jansson_private.h" +#include "hashtable.h" +#include "strbuffer.h" #include "utf.h" +#include #include typedef struct { diff --git a/src/strbuffer.c b/src/strbuffer.c index d9bcd439..05edbba7 100644 --- a/src/strbuffer.c +++ b/src/strbuffer.c @@ -11,6 +11,7 @@ #include "strbuffer.h" #include "jansson_private.h" +#include #include #include diff --git a/src/strconv.c b/src/strconv.c index 9e202c5c..3a27420b 100644 --- a/src/strconv.c +++ b/src/strconv.c @@ -1,14 +1,16 @@ +#include "jansson_config.h" #include "jansson_private.h" #include "strbuffer.h" #include #include #include #include +#include #include /* need jansson_private_config.h to get the correct snprintf */ #ifdef HAVE_CONFIG_H -#include +#include "jansson_private_config.h" #endif /* diff --git a/src/utf.c b/src/utf.c index 28b2f7d3..4583e226 100644 --- a/src/utf.c +++ b/src/utf.c @@ -6,7 +6,6 @@ */ #include "utf.h" -#include int utf8_encode(int32_t codepoint, char *buffer, size_t *size) { if (codepoint < 0) diff --git a/src/utf.h b/src/utf.h index 5db99df6..2ccdd3e2 100644 --- a/src/utf.h +++ b/src/utf.h @@ -9,7 +9,7 @@ #define UTF_H #ifdef HAVE_CONFIG_H -#include +#include "jansson_private_config.h" #endif #include diff --git a/src/value.c b/src/value.c index d5a11fe5..41f8d5bb 100644 --- a/src/value.c +++ b/src/value.c @@ -10,11 +10,13 @@ #endif #ifdef HAVE_CONFIG_H -#include +#include "jansson_private_config.h" #endif #include +#include #include +#include #include #include @@ -24,6 +26,7 @@ #include "hashtable.h" #include "jansson.h" +#include "jansson_config.h" #include "jansson_private.h" #include "utf.h" diff --git a/test/bin/json_process.c b/test/bin/json_process.c index 965fa6b2..63329ba5 100644 --- a/test/bin/json_process.c +++ b/test/bin/json_process.c @@ -6,11 +6,11 @@ */ #ifdef HAVE_CONFIG_H -#include +#include "jansson_private_config.h" #endif +#include "jansson.h" #include -#include #include #include #include diff --git a/test/suites/api/test_array.c b/test/suites/api/test_array.c index e5d9d1a1..13c0cbed 100644 --- a/test/suites/api/test_array.c +++ b/test/suites/api/test_array.c @@ -6,7 +6,7 @@ */ #include "util.h" -#include +#include "jansson.h" static void test_misc(void) { json_t *array, *five, *seven, *value; diff --git a/test/suites/api/test_chaos.c b/test/suites/api/test_chaos.c index 8687243e..6822de78 100644 --- a/test/suites/api/test_chaos.c +++ b/test/suites/api/test_chaos.c @@ -3,7 +3,7 @@ #endif #include "util.h" -#include +#include "jansson.h" #include #include diff --git a/test/suites/api/test_copy.c b/test/suites/api/test_copy.c index 656d98dd..60acd97a 100644 --- a/test/suites/api/test_copy.c +++ b/test/suites/api/test_copy.c @@ -6,7 +6,7 @@ */ #include "util.h" -#include +#include "jansson.h" #include static void test_copy_simple(void) { diff --git a/test/suites/api/test_dump.c b/test/suites/api/test_dump.c index e8cb5196..2ded3465 100644 --- a/test/suites/api/test_dump.c +++ b/test/suites/api/test_dump.c @@ -7,7 +7,7 @@ #include "jansson_private_config.h" -#include +#include "jansson.h" #include #ifdef HAVE_UNISTD_H #include diff --git a/test/suites/api/test_dump_callback.c b/test/suites/api/test_dump_callback.c index 80ea0084..daa2956f 100644 --- a/test/suites/api/test_dump_callback.c +++ b/test/suites/api/test_dump_callback.c @@ -6,7 +6,7 @@ */ #include "util.h" -#include +#include "jansson.h" #include #include diff --git a/test/suites/api/test_equal.c b/test/suites/api/test_equal.c index d068b7bf..3b5255d3 100644 --- a/test/suites/api/test_equal.c +++ b/test/suites/api/test_equal.c @@ -6,7 +6,7 @@ */ #include "util.h" -#include +#include "jansson.h" static void test_equal_simple() { json_t *value1, *value2; diff --git a/test/suites/api/test_fixed_size.c b/test/suites/api/test_fixed_size.c index 4ae9e079..4668db20 100644 --- a/test/suites/api/test_fixed_size.c +++ b/test/suites/api/test_fixed_size.c @@ -6,7 +6,7 @@ */ #include "util.h" -#include +#include "jansson.h" #include static void test_keylen_iterator(json_t *object) { diff --git a/test/suites/api/test_load.c b/test/suites/api/test_load.c index 1c64b0c8..c29f4f37 100644 --- a/test/suites/api/test_load.c +++ b/test/suites/api/test_load.c @@ -6,7 +6,7 @@ */ #include "util.h" -#include +#include "jansson.h" #include static void file_not_found() { diff --git a/test/suites/api/test_load_callback.c b/test/suites/api/test_load_callback.c index b292fcf4..2eec5a7a 100644 --- a/test/suites/api/test_load_callback.c +++ b/test/suites/api/test_load_callback.c @@ -6,7 +6,7 @@ */ #include "util.h" -#include +#include "jansson.h" #include #include diff --git a/test/suites/api/test_loadb.c b/test/suites/api/test_loadb.c index 2cd88fef..5732738f 100644 --- a/test/suites/api/test_loadb.c +++ b/test/suites/api/test_loadb.c @@ -6,7 +6,7 @@ */ #include "util.h" -#include +#include "jansson.h" #include static void run_tests() { diff --git a/test/suites/api/test_memory_funcs.c b/test/suites/api/test_memory_funcs.c index 4fd61665..6fbbe4b2 100644 --- a/test/suites/api/test_memory_funcs.c +++ b/test/suites/api/test_memory_funcs.c @@ -1,4 +1,4 @@ -#include +#include "jansson.h" #include #include "util.h" diff --git a/test/suites/api/test_number.c b/test/suites/api/test_number.c index 2a22a67d..3c41a6cf 100644 --- a/test/suites/api/test_number.c +++ b/test/suites/api/test_number.c @@ -6,7 +6,7 @@ */ #include "util.h" -#include +#include "jansson.h" #include #ifdef INFINITY diff --git a/test/suites/api/test_object.c b/test/suites/api/test_object.c index 331edf22..89f53bf8 100644 --- a/test/suites/api/test_object.c +++ b/test/suites/api/test_object.c @@ -6,7 +6,7 @@ */ #include "util.h" -#include +#include "jansson.h" #include static void test_clear() { diff --git a/test/suites/api/test_pack.c b/test/suites/api/test_pack.c index 865f60b6..bfd3e60f 100644 --- a/test/suites/api/test_pack.c +++ b/test/suites/api/test_pack.c @@ -7,13 +7,13 @@ */ #ifdef HAVE_CONFIG_H -#include +#include "jansson_private_config.h" #endif -#include +#include "jansson_config.h" #include "util.h" -#include +#include "jansson.h" #include #include #include diff --git a/test/suites/api/test_simple.c b/test/suites/api/test_simple.c index 7a3f6b7b..d801ebab 100644 --- a/test/suites/api/test_simple.c +++ b/test/suites/api/test_simple.c @@ -6,7 +6,7 @@ */ #include "util.h" -#include +#include "jansson.h" #include static void test_bad_args(void) { diff --git a/test/suites/api/test_sprintf.c b/test/suites/api/test_sprintf.c index 60a0b601..a3999066 100644 --- a/test/suites/api/test_sprintf.c +++ b/test/suites/api/test_sprintf.c @@ -1,5 +1,5 @@ #include "util.h" -#include +#include "jansson.h" #include static void test_sprintf() { diff --git a/test/suites/api/test_unpack.c b/test/suites/api/test_unpack.c index 139ec6f7..414baab9 100644 --- a/test/suites/api/test_unpack.c +++ b/test/suites/api/test_unpack.c @@ -7,7 +7,7 @@ */ #include "util.h" -#include +#include "jansson.h" #include #include diff --git a/test/suites/api/test_version.c b/test/suites/api/test_version.c index 05e0e961..dcf690f4 100644 --- a/test/suites/api/test_version.c +++ b/test/suites/api/test_version.c @@ -6,7 +6,7 @@ */ #include "util.h" -#include +#include "jansson.h" #include static void test_version_str(void) { diff --git a/test/suites/api/util.h b/test/suites/api/util.h index d964c493..eec610c1 100644 --- a/test/suites/api/util.h +++ b/test/suites/api/util.h @@ -9,7 +9,7 @@ #define UTIL_H #ifdef HAVE_CONFIG_H -#include +#include "jansson_private_config.h" #endif #include @@ -18,7 +18,7 @@ #include #endif -#include +#include "jansson.h" #define failhdr fprintf(stderr, "%s:%d: ", __FILE__, __LINE__)