From 65b59bd78ae2e455ec64c2deeb599f9f3a13ee13 Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Sat, 19 Mar 2016 11:46:49 +0900 Subject: [PATCH] Include config.h from tests/*.h --- tests/failmalloc_test.h | 4 ++++ tests/malloc_wrapper.h | 4 ++++ tests/nghttp2_buf_test.h | 4 ++++ tests/nghttp2_frame_test.h | 4 ++++ tests/nghttp2_hd_test.h | 4 ++++ tests/nghttp2_helper_test.h | 4 ++++ tests/nghttp2_map_test.h | 4 ++++ tests/nghttp2_npn_test.c | 3 --- tests/nghttp2_npn_test.h | 4 ++++ tests/nghttp2_pq_test.h | 4 ++++ tests/nghttp2_queue_test.h | 4 ++++ tests/nghttp2_session_test.h | 4 ++++ tests/nghttp2_stream_test.h | 4 ++++ 13 files changed, 48 insertions(+), 3 deletions(-) diff --git a/tests/failmalloc_test.h b/tests/failmalloc_test.h index 1969bc12..fb7e7701 100644 --- a/tests/failmalloc_test.h +++ b/tests/failmalloc_test.h @@ -25,6 +25,10 @@ #ifndef FAILMALLOC_TEST_H #define FAILMALLOC_TEST_H +#ifdef HAVE_CONFIG_H +#include +#endif /* HAVE_CONFIG_H */ + void test_nghttp2_session_send(void); void test_nghttp2_session_recv(void); void test_nghttp2_frame(void); diff --git a/tests/malloc_wrapper.h b/tests/malloc_wrapper.h index 5405d099..62369d6f 100644 --- a/tests/malloc_wrapper.h +++ b/tests/malloc_wrapper.h @@ -25,6 +25,10 @@ #ifndef MALLOC_WRAPPER_H #define MALLOC_WRAPPER_H +#ifdef HAVE_CONFIG_H +#include +#endif /* HAVE_CONFIG_H */ + #include #include "nghttp2_mem.h" diff --git a/tests/nghttp2_buf_test.h b/tests/nghttp2_buf_test.h index 0b94a3f4..c37e5150 100644 --- a/tests/nghttp2_buf_test.h +++ b/tests/nghttp2_buf_test.h @@ -25,6 +25,10 @@ #ifndef NGHTTP2_BUF_TEST_H #define NGHTTP2_BUF_TEST_H +#ifdef HAVE_CONFIG_H +#include +#endif /* HAVE_CONFIG_H */ + void test_nghttp2_bufs_add(void); void test_nghttp2_bufs_add_stack_buffer_overflow_bug(void); void test_nghttp2_bufs_addb(void); diff --git a/tests/nghttp2_frame_test.h b/tests/nghttp2_frame_test.h index a0ce37b8..f3f4530e 100644 --- a/tests/nghttp2_frame_test.h +++ b/tests/nghttp2_frame_test.h @@ -25,6 +25,10 @@ #ifndef NGHTTP2_FRAME_TEST_H #define NGHTTP2_FRAME_TEST_H +#ifdef HAVE_CONFIG_H +#include +#endif /* HAVE_CONFIG_H */ + void test_nghttp2_frame_pack_headers(void); void test_nghttp2_frame_pack_headers_frame_too_large(void); void test_nghttp2_frame_pack_priority(void); diff --git a/tests/nghttp2_hd_test.h b/tests/nghttp2_hd_test.h index 158a98c5..bf28282c 100644 --- a/tests/nghttp2_hd_test.h +++ b/tests/nghttp2_hd_test.h @@ -25,6 +25,10 @@ #ifndef NGHTTP2_HD_TEST_H #define NGHTTP2_HD_TEST_H +#ifdef HAVE_CONFIG_H +#include +#endif /* HAVE_CONFIG_H */ + void test_nghttp2_hd_deflate(void); void test_nghttp2_hd_deflate_same_indexed_repr(void); void test_nghttp2_hd_inflate_indexed(void); diff --git a/tests/nghttp2_helper_test.h b/tests/nghttp2_helper_test.h index 173fde60..68bdb6f9 100644 --- a/tests/nghttp2_helper_test.h +++ b/tests/nghttp2_helper_test.h @@ -25,6 +25,10 @@ #ifndef NGHTTP2_HELPER_TEST_H #define NGHTTP2_HELPER_TEST_H +#ifdef HAVE_CONFIG_H +#include +#endif /* HAVE_CONFIG_H */ + void test_nghttp2_adjust_local_window_size(void); void test_nghttp2_check_header_name(void); void test_nghttp2_check_header_value(void); diff --git a/tests/nghttp2_map_test.h b/tests/nghttp2_map_test.h index f0b723bc..9f2770a0 100644 --- a/tests/nghttp2_map_test.h +++ b/tests/nghttp2_map_test.h @@ -25,6 +25,10 @@ #ifndef NGHTTP2_MAP_TEST_H #define NGHTTP2_MAP_TEST_H +#ifdef HAVE_CONFIG_H +#include +#endif /* HAVE_CONFIG_H */ + void test_nghttp2_map(void); void test_nghttp2_map_functional(void); void test_nghttp2_map_each_free(void); diff --git a/tests/nghttp2_npn_test.c b/tests/nghttp2_npn_test.c index db7fd9ff..cbd65b71 100644 --- a/tests/nghttp2_npn_test.c +++ b/tests/nghttp2_npn_test.c @@ -22,9 +22,6 @@ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#ifdef HAVE_CONFIG_H -#include -#endif /* HAVE_CONFIG_H */ #include "nghttp2_npn_test.h" #include diff --git a/tests/nghttp2_npn_test.h b/tests/nghttp2_npn_test.h index e806f3a9..9d85e649 100644 --- a/tests/nghttp2_npn_test.h +++ b/tests/nghttp2_npn_test.h @@ -25,6 +25,10 @@ #ifndef NGHTTP2_NPN_TEST_H #define NGHTTP2_NPN_TEST_H +#ifdef HAVE_CONFIG_H +#include +#endif /* HAVE_CONFIG_H */ + void test_nghttp2_npn(void); #endif /* NGHTTP2_NPN_TEST_H */ diff --git a/tests/nghttp2_pq_test.h b/tests/nghttp2_pq_test.h index 2936174e..2ce16614 100644 --- a/tests/nghttp2_pq_test.h +++ b/tests/nghttp2_pq_test.h @@ -25,6 +25,10 @@ #ifndef NGHTTP2_PQ_TEST_H #define NGHTTP2_PQ_TEST_H +#ifdef HAVE_CONFIG_H +#include +#endif /* HAVE_CONFIG_H */ + void test_nghttp2_pq(void); void test_nghttp2_pq_update(void); void test_nghttp2_pq_remove(void); diff --git a/tests/nghttp2_queue_test.h b/tests/nghttp2_queue_test.h index 944697e3..eb4d5299 100644 --- a/tests/nghttp2_queue_test.h +++ b/tests/nghttp2_queue_test.h @@ -25,6 +25,10 @@ #ifndef NGHTTP2_QUEUE_TEST_H #define NGHTTP2_QUEUE_TEST_H +#ifdef HAVE_CONFIG_H +#include +#endif /* HAVE_CONFIG_H */ + void test_nghttp2_queue(void); #endif /* NGHTTP2_QUEUE_TEST_H */ diff --git a/tests/nghttp2_session_test.h b/tests/nghttp2_session_test.h index 3d1d8f28..27415c2f 100644 --- a/tests/nghttp2_session_test.h +++ b/tests/nghttp2_session_test.h @@ -25,6 +25,10 @@ #ifndef NGHTTP2_SESSION_TEST_H #define NGHTTP2_SESSION_TEST_H +#ifdef HAVE_CONFIG_H +#include +#endif /* HAVE_CONFIG_H */ + void test_nghttp2_session_recv(void); void test_nghttp2_session_recv_invalid_stream_id(void); void test_nghttp2_session_recv_invalid_frame(void); diff --git a/tests/nghttp2_stream_test.h b/tests/nghttp2_stream_test.h index 508a8e1c..16a1f0a1 100644 --- a/tests/nghttp2_stream_test.h +++ b/tests/nghttp2_stream_test.h @@ -25,4 +25,8 @@ #ifndef NGHTTP2_STREAM_TEST_H #define NGHTTP2_STREAM_TEST_H +#ifdef HAVE_CONFIG_H +#include +#endif /* HAVE_CONFIG_H */ + #endif /* NGHTTP2_STREAM_TEST_H */