Replaced config.h with more unique name nghttp_user_config.h

-- Merged two solution into one (use everywhere nghttp2_config.h).
-- replace config.h with nghttp2_user_config.h
This commit is contained in:
Dusan Cervenka (nxa14949) 2019-02-21 14:18:03 +01:00
parent f5feb16ef4
commit c390d6faed
61 changed files with 62 additions and 180 deletions

View File

@ -396,7 +396,7 @@ if(NOT ENABLE_THREADS OR NOT HAVE_STD_FUTURE)
endif() endif()
add_definitions(-DHAVE_CONFIG_H) add_definitions(-DHAVE_CONFIG_H)
configure_file(cmakeconfig.h.in config.h) configure_file(cmakeconfig.h.in nghttp2_config.h)
# autotools-compatible names # autotools-compatible names
# Sphinx expects relative paths in the .rst files. Use the fact that the files # Sphinx expects relative paths in the .rst files. Use the fact that the files
# below are all one directory level deep. # below are all one directory level deep.
@ -442,7 +442,7 @@ foreach(name
endforeach() endforeach()
include_directories( include_directories(
"${CMAKE_CURRENT_BINARY_DIR}" # for config.h "${CMAKE_CURRENT_BINARY_DIR}" # for nghttp2_config.h
) )
# For use in src/CMakeLists.txt # For use in src/CMakeLists.txt
set(PKGDATADIR "${CMAKE_INSTALL_FULL_DATADIR}/${CMAKE_PROJECT_NAME}") set(PKGDATADIR "${CMAKE_INSTALL_FULL_DATADIR}/${CMAKE_PROJECT_NAME}")

View File

@ -25,9 +25,7 @@
#ifndef NGHTTP2_BUF_H #ifndef NGHTTP2_BUF_H
#define NGHTTP2_BUF_H #define NGHTTP2_BUF_H
#ifdef HAVE_CONFIG_H #include "nghttp2_config.h"
# include <config.h>
#endif /* HAVE_CONFIG_H */
#include <nghttp2/nghttp2.h> #include <nghttp2/nghttp2.h>

View File

@ -25,9 +25,7 @@
#ifndef NGHTTP2_CALLBACKS_H #ifndef NGHTTP2_CALLBACKS_H
#define NGHTTP2_CALLBACKS_H #define NGHTTP2_CALLBACKS_H
#ifdef HAVE_CONFIG_H #include "nghttp2_config.h"
# include <config.h>
#endif /* HAVE_CONFIG_H */
#include <nghttp2/nghttp2.h> #include <nghttp2/nghttp2.h>

View File

@ -25,9 +25,7 @@
#ifndef NGHTTP2_DEBUG_H #ifndef NGHTTP2_DEBUG_H
#define NGHTTP2_DEBUG_H #define NGHTTP2_DEBUG_H
#ifdef HAVE_CONFIG_H #include "nghttp2_config.h"
# include <config.h>
#endif /* HAVE_CONFIG_H */
#include <nghttp2/nghttp2.h> #include <nghttp2/nghttp2.h>

View File

@ -25,9 +25,7 @@
#ifndef NGHTTP2_FRAME_H #ifndef NGHTTP2_FRAME_H
#define NGHTTP2_FRAME_H #define NGHTTP2_FRAME_H
#ifdef HAVE_CONFIG_H #include "nghttp2_config.h"
# include <config.h>
#endif /* HAVE_CONFIG_H */
#include <nghttp2/nghttp2.h> #include <nghttp2/nghttp2.h>
#include "nghttp2_hd.h" #include "nghttp2_hd.h"

View File

@ -25,9 +25,7 @@
#ifndef NGHTTP2_HD_H #ifndef NGHTTP2_HD_H
#define NGHTTP2_HD_H #define NGHTTP2_HD_H
#ifdef HAVE_CONFIG_H #include "nghttp2_config.h"
# include <config.h>
#endif /* HAVE_CONFIG_H */
#include <nghttp2/nghttp2.h> #include <nghttp2/nghttp2.h>

View File

@ -25,9 +25,7 @@
#ifndef NGHTTP2_HD_HUFFMAN_H #ifndef NGHTTP2_HD_HUFFMAN_H
#define NGHTTP2_HD_HUFFMAN_H #define NGHTTP2_HD_HUFFMAN_H
#ifdef HAVE_CONFIG_H #include "nghttp2_config.h"
# include <config.h>
#endif /* HAVE_CONFIG_H */
#include <nghttp2/nghttp2.h> #include <nghttp2/nghttp2.h>

View File

@ -25,9 +25,7 @@
#ifndef NGHTTP2_HELPER_H #ifndef NGHTTP2_HELPER_H
#define NGHTTP2_HELPER_H #define NGHTTP2_HELPER_H
#ifdef HAVE_CONFIG_H #include "nghttp2_config.h"
# include <config.h>
#endif /* HAVE_CONFIG_H */
#include <string.h> #include <string.h>
#include <stddef.h> #include <stddef.h>

View File

@ -25,9 +25,7 @@
#ifndef NGHTTP2_HTTP_H #ifndef NGHTTP2_HTTP_H
#define NGHTTP2_HTTP_H #define NGHTTP2_HTTP_H
#ifdef HAVE_CONFIG_H #include "nghttp2_config.h"
# include <config.h>
#endif /* HAVE_CONFIG_H */
#include <nghttp2/nghttp2.h> #include <nghttp2/nghttp2.h>
#include "nghttp2_session.h" #include "nghttp2_session.h"

View File

@ -25,9 +25,7 @@
#ifndef NGHTTP2_INT_H #ifndef NGHTTP2_INT_H
#define NGHTTP2_INT_H #define NGHTTP2_INT_H
#ifdef HAVE_CONFIG_H #include "nghttp2_config.h"
# include <config.h>
#endif /* HAVE_CONFIG_H */
#include <nghttp2/nghttp2.h> #include <nghttp2/nghttp2.h>

View File

@ -25,9 +25,7 @@
#ifndef NGHTTP2_MAP_H #ifndef NGHTTP2_MAP_H
#define NGHTTP2_MAP_H #define NGHTTP2_MAP_H
#ifdef HAVE_CONFIG_H #include "nghttp2_config.h"
# include <config.h>
#endif /* HAVE_CONFIG_H */
#include <nghttp2/nghttp2.h> #include <nghttp2/nghttp2.h>
#include "nghttp2_int.h" #include "nghttp2_int.h"

View File

@ -25,9 +25,7 @@
#ifndef NGHTTP2_MEM_H #ifndef NGHTTP2_MEM_H
#define NGHTTP2_MEM_H #define NGHTTP2_MEM_H
#ifdef HAVE_CONFIG_H #include "nghttp2_config.h"
# include <config.h>
#endif /* HAVE_CONFIG_H */
#include <nghttp2/nghttp2.h> #include <nghttp2/nghttp2.h>

View File

@ -25,9 +25,7 @@
#ifndef NGHTTP2_NET_H #ifndef NGHTTP2_NET_H
#define NGHTTP2_NET_H #define NGHTTP2_NET_H
#ifdef HAVE_CONFIG_H #include "nghttp2_config.h"
# include <config.h>
#endif /* HAVE_CONFIG_H */
#ifdef HAVE_ARPA_INET_H #ifdef HAVE_ARPA_INET_H
# include <arpa/inet.h> # include <arpa/inet.h>

View File

@ -25,9 +25,7 @@
#ifndef NGHTTP2_NPN_H #ifndef NGHTTP2_NPN_H
#define NGHTTP2_NPN_H #define NGHTTP2_NPN_H
#ifdef HAVE_CONFIG_H #include "nghttp2_config.h"
# include <config.h>
#endif /* HAVE_CONFIG_H */
#include <nghttp2/nghttp2.h> #include <nghttp2/nghttp2.h>

View File

@ -25,9 +25,7 @@
#ifndef NGHTTP2_OPTION_H #ifndef NGHTTP2_OPTION_H
#define NGHTTP2_OPTION_H #define NGHTTP2_OPTION_H
#ifdef HAVE_CONFIG_H #include "nghttp2_config.h"
# include <config.h>
#endif /* HAVE_CONFIG_H */
#include <nghttp2/nghttp2.h> #include <nghttp2/nghttp2.h>

View File

@ -25,9 +25,7 @@
#ifndef NGHTTP2_OUTBOUND_ITEM_H #ifndef NGHTTP2_OUTBOUND_ITEM_H
#define NGHTTP2_OUTBOUND_ITEM_H #define NGHTTP2_OUTBOUND_ITEM_H
#ifdef HAVE_CONFIG_H #include "nghttp2_config.h"
# include <config.h>
#endif /* HAVE_CONFIG_H */
#include <nghttp2/nghttp2.h> #include <nghttp2/nghttp2.h>
#include "nghttp2_frame.h" #include "nghttp2_frame.h"

View File

@ -25,9 +25,7 @@
#ifndef NGHTTP2_PQ_H #ifndef NGHTTP2_PQ_H
#define NGHTTP2_PQ_H #define NGHTTP2_PQ_H
#ifdef HAVE_CONFIG_H #include "nghttp2_config.h"
# include <config.h>
#endif /* HAVE_CONFIG_H */
#include <nghttp2/nghttp2.h> #include <nghttp2/nghttp2.h>
#include "nghttp2_int.h" #include "nghttp2_int.h"

View File

@ -25,9 +25,7 @@
#ifndef NGHTTP2_PRIORITY_SPEC_H #ifndef NGHTTP2_PRIORITY_SPEC_H
#define NGHTTP2_PRIORITY_SPEC_H #define NGHTTP2_PRIORITY_SPEC_H
#ifdef HAVE_CONFIG_H #include "nghttp2_config.h"
# include <config.h>
#endif /* HAVE_CONFIG_H */
#include <nghttp2/nghttp2.h> #include <nghttp2/nghttp2.h>

View File

@ -25,9 +25,7 @@
#ifndef NGHTTP2_QUEUE_H #ifndef NGHTTP2_QUEUE_H
#define NGHTTP2_QUEUE_H #define NGHTTP2_QUEUE_H
#ifdef HAVE_CONFIG_H #include "nghttp2_config.h"
# include "config.h"
#endif /* HAVE_CONFIG_H */
#include <nghttp2/nghttp2.h> #include <nghttp2/nghttp2.h>

View File

@ -25,9 +25,7 @@
#ifndef NGHTTP2_RCBUF_H #ifndef NGHTTP2_RCBUF_H
#define NGHTTP2_RCBUF_H #define NGHTTP2_RCBUF_H
#ifdef HAVE_CONFIG_H #include "nghttp2_config.h"
# include <config.h>
#endif /* HAVE_CONFIG_H */
#include <nghttp2/nghttp2.h> #include <nghttp2/nghttp2.h>

View File

@ -25,9 +25,7 @@
#ifndef NGHTTP2_SESSION_H #ifndef NGHTTP2_SESSION_H
#define NGHTTP2_SESSION_H #define NGHTTP2_SESSION_H
#ifdef HAVE_CONFIG_H #include "nghttp2_config.h"
# include <config.h>
#endif /* HAVE_CONFIG_H */
#include <nghttp2/nghttp2.h> #include <nghttp2/nghttp2.h>
#include "nghttp2_map.h" #include "nghttp2_map.h"

View File

@ -25,9 +25,7 @@
#ifndef NGHTTP2_STREAM_H #ifndef NGHTTP2_STREAM_H
#define NGHTTP2_STREAM_H #define NGHTTP2_STREAM_H
#ifdef HAVE_CONFIG_H #include "nghttp2_config.h"
# include <config.h>
#endif /* HAVE_CONFIG_H */
#include <nghttp2/nghttp2.h> #include <nghttp2/nghttp2.h>
#include "nghttp2_outbound_item.h" #include "nghttp2_outbound_item.h"

View File

@ -25,9 +25,7 @@
#ifndef NGHTTP2_SUBMIT_H #ifndef NGHTTP2_SUBMIT_H
#define NGHTTP2_SUBMIT_H #define NGHTTP2_SUBMIT_H
#ifdef HAVE_CONFIG_H #include "nghttp2_config.h"
# include <config.h>
#endif /* HAVE_CONFIG_H */
#include <nghttp2/nghttp2.h> #include <nghttp2/nghttp2.h>

View File

@ -22,9 +22,7 @@
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/ */
#ifdef HAVE_CONFIG_H #include "nghttp2_config.h"
# include <config.h>
#endif /* HAVE_CONFIG_H */
#include <nghttp2/nghttp2.h> #include <nghttp2/nghttp2.h>

View File

@ -25,9 +25,7 @@
#ifndef BASE64_TEST_H #ifndef BASE64_TEST_H
#define BASE64_TEST_H #define BASE64_TEST_H
#ifdef HAVE_CONFIG_H #include "nghttp2_config.h"
# include <config.h>
#endif // HAVE_CONFIG_H
namespace nghttp2 { namespace nghttp2 {

View File

@ -25,9 +25,7 @@
#ifndef BUFFER_TEST_H #ifndef BUFFER_TEST_H
#define BUFFER_TEST_H #define BUFFER_TEST_H
#ifdef HAVE_CONFIG_H #include "nghttp2_config.h"
# include <config.h>
#endif // HAVE_CONFIG_H
namespace nghttp2 { namespace nghttp2 {

View File

@ -25,9 +25,7 @@
#ifndef NGHTTP2_COMP_HELPER_H #ifndef NGHTTP2_COMP_HELPER_H
#define NGHTTP2_COMP_HELPER_H #define NGHTTP2_COMP_HELPER_H
#ifdef HAVE_CONFIG_H #include "nghttp2_config.h"
# include <config.h>
#endif /* HAVE_CONFIG_H */
#include <jansson.h> #include <jansson.h>

View File

@ -22,9 +22,7 @@
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/ */
#ifdef HAVE_CONFIG_H #include "nghttp2_config.h"
# include <config.h>
#endif // HAVE_CONFIG_H
#ifdef HAVE_UNISTD_H #ifdef HAVE_UNISTD_H
# include <unistd.h> # include <unistd.h>

View File

@ -25,9 +25,7 @@
#ifndef SHRPX_HTTP2_TEST_H #ifndef SHRPX_HTTP2_TEST_H
#define SHRPX_HTTP2_TEST_H #define SHRPX_HTTP2_TEST_H
#ifdef HAVE_CONFIG_H #include "nghttp2_config.h"
# include <config.h>
#endif // HAVE_CONFIG_H
namespace shrpx { namespace shrpx {

View File

@ -22,9 +22,7 @@
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/ */
#ifdef HAVE_CONFIG_H #include "nghttp2_config.h"
# include <config.h>
#endif // HAVE_CONFIG_H
#ifdef HAVE_UNISTD_H #ifdef HAVE_UNISTD_H
# include <unistd.h> # include <unistd.h>

View File

@ -25,9 +25,7 @@
#ifndef MEMCHUNK_TEST_H #ifndef MEMCHUNK_TEST_H
#define MEMCHUNK_TEST_H #define MEMCHUNK_TEST_H
#ifdef HAVE_CONFIG_H #include "nghttp2_config.h"
# include <config.h>
#endif // HAVE_CONFIG_H
namespace nghttp2 { namespace nghttp2 {

View File

@ -25,9 +25,7 @@
#ifndef NETWORK_H #ifndef NETWORK_H
#define NETWORK_H #define NETWORK_H
#ifdef HAVE_CONFIG_H #include "nghttp2_config.h"
# include <config.h>
#endif // HAVE_CONFIG_H
#include <sys/types.h> #include <sys/types.h>
#ifdef HAVE_SYS_SOCKET_H #ifdef HAVE_SYS_SOCKET_H

View File

@ -26,7 +26,7 @@
#define NGHTTP2_CONFIG_H #define NGHTTP2_CONFIG_H
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
# include <config.h> # include "nghttp2_user_config.h"
#endif // HAVE_CONFIG_H #endif // HAVE_CONFIG_H
#endif // NGHTTP2_CONFIG_H #endif // NGHTTP2_CONFIG_H

View File

@ -24,9 +24,7 @@
*/ */
#ifndef NGHTTP2_GZIP_H #ifndef NGHTTP2_GZIP_H
# ifdef HAVE_CONFIG_H # include "nghttp2_config.h"
# include <config.h>
# endif /* HAVE_CONFIG_H */
# include <zlib.h> # include <zlib.h>
# include <nghttp2/nghttp2.h> # include <nghttp2/nghttp2.h>

View File

@ -25,9 +25,7 @@
#ifndef NGHTTP2_GZIP_TEST_H #ifndef NGHTTP2_GZIP_TEST_H
#define NGHTTP2_GZIP_TEST_H #define NGHTTP2_GZIP_TEST_H
#ifdef HAVE_CONFIG_H #include "nghttp2_config.h"
# include <config.h>
#endif /* HAVE_CONFIG_H */
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

View File

@ -22,9 +22,7 @@
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/ */
#ifdef HAVE_CONFIG_H #include "nghttp2_config.h"
# include <config.h>
#endif // HAVE_CONFIG_H
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>

View File

@ -25,9 +25,7 @@
#ifndef SHRPX_CONFIG_TEST_H #ifndef SHRPX_CONFIG_TEST_H
#define SHRPX_CONFIG_TEST_H #define SHRPX_CONFIG_TEST_H
#ifdef HAVE_CONFIG_H #include "nghttp2_config.h"
# include <config.h>
#endif // HAVE_CONFIG_H
namespace shrpx { namespace shrpx {

View File

@ -25,9 +25,7 @@
#ifndef SHRPX_DOWNSTREAM_TEST_H #ifndef SHRPX_DOWNSTREAM_TEST_H
#define SHRPX_DOWNSTREAM_TEST_H #define SHRPX_DOWNSTREAM_TEST_H
#ifdef HAVE_CONFIG_H #include "nghttp2_config.h"
# include <config.h>
#endif // HAVE_CONFIG_H
namespace shrpx { namespace shrpx {

View File

@ -25,9 +25,7 @@
#ifndef SHRPX_HTTP_TEST_H #ifndef SHRPX_HTTP_TEST_H
#define SHRPX_HTTP_TEST_H #define SHRPX_HTTP_TEST_H
#ifdef HAVE_CONFIG_H #include "nghttp2_config.h"
# include <config.h>
#endif // HAVE_CONFIG_H
namespace shrpx { namespace shrpx {

View File

@ -25,9 +25,7 @@
#ifndef SHRPX_ROUTER_TEST_H #ifndef SHRPX_ROUTER_TEST_H
#define SHRPX_ROUTER_TEST_H #define SHRPX_ROUTER_TEST_H
#ifdef HAVE_CONFIG_H #include "nghttp2_config.h"
# include <config.h>
#endif // HAVE_CONFIG_H
namespace shrpx { namespace shrpx {

View File

@ -25,9 +25,7 @@
#ifndef SHRPX_TLS_TEST_H #ifndef SHRPX_TLS_TEST_H
#define SHRPX_TLS_TEST_H #define SHRPX_TLS_TEST_H
#ifdef HAVE_CONFIG_H #include "nghttp2_config.h"
# include <config.h>
#endif // HAVE_CONFIG_H
namespace shrpx { namespace shrpx {

View File

@ -25,9 +25,7 @@
#ifndef SHRPX_WORKER_TEST_H #ifndef SHRPX_WORKER_TEST_H
#define SHRPX_WORKER_TEST_H #define SHRPX_WORKER_TEST_H
#ifdef HAVE_CONFIG_H #include "nghttp2_config.h"
# include <config.h>
#endif // HAVE_CONFIG_H
namespace shrpx { namespace shrpx {

View File

@ -25,9 +25,7 @@
#ifndef TEMPLATE_TEST_H #ifndef TEMPLATE_TEST_H
#define TEMPLATE_TEST_H #define TEMPLATE_TEST_H
#ifdef HAVE_CONFIG_H #include "nghttp2_config.h"
# include <config.h>
#endif // HAVE_CONFIG_H
namespace nghttp2 { namespace nghttp2 {

View File

@ -25,9 +25,7 @@
#ifndef TIMEGM_H #ifndef TIMEGM_H
#define TIMEGM_H #define TIMEGM_H
#ifdef HAVE_CONFIG_H #include "nghttp2_config.h"
# include <config.h>
#endif /* HAVE_CONFIG_H */
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

View File

@ -25,9 +25,7 @@
#ifndef UTIL_TEST_H #ifndef UTIL_TEST_H
#define UTIL_TEST_H #define UTIL_TEST_H
#ifdef HAVE_CONFIG_H #include "nghttp2_config.h"
# include <config.h>
#endif // HAVE_CONFIG_H
namespace shrpx { namespace shrpx {

View File

@ -25,9 +25,7 @@
#ifndef XSI_STRERROR_H #ifndef XSI_STRERROR_H
#define XSI_STRERROR_H #define XSI_STRERROR_H
#ifdef HAVE_CONFIG_H #include "nghttp2_config.h"
# include <config.h>
#endif /* HAVE_CONFIG_H */
#include <stddef.h> #include <stddef.h>

View File

@ -22,9 +22,7 @@
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/ */
#ifdef HAVE_CONFIG_H #include "nghttp2_config.h"
# include <config.h>
#endif /* HAVE_CONFIG_H */
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>

View File

@ -25,9 +25,7 @@
#ifndef FAILMALLOC_TEST_H #ifndef FAILMALLOC_TEST_H
#define FAILMALLOC_TEST_H #define FAILMALLOC_TEST_H
#ifdef HAVE_CONFIG_H #include "nghttp2_config.h"
# include <config.h>
#endif /* HAVE_CONFIG_H */
void test_nghttp2_session_send(void); void test_nghttp2_session_send(void);
void test_nghttp2_session_send_server(void); void test_nghttp2_session_send_server(void);

View File

@ -22,9 +22,7 @@
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/ */
#ifdef HAVE_CONFIG_H #include "nghttp2_config.h"
# include <config.h>
#endif /* HAVE_CONFIG_H */
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>

View File

@ -25,9 +25,7 @@
#ifndef MALLOC_WRAPPER_H #ifndef MALLOC_WRAPPER_H
#define MALLOC_WRAPPER_H #define MALLOC_WRAPPER_H
#ifdef HAVE_CONFIG_H #include "nghttp2_config.h"
# include <config.h>
#endif /* HAVE_CONFIG_H */
#include <stdlib.h> #include <stdlib.h>

View File

@ -25,9 +25,7 @@
#ifndef NGHTTP2_BUF_TEST_H #ifndef NGHTTP2_BUF_TEST_H
#define NGHTTP2_BUF_TEST_H #define NGHTTP2_BUF_TEST_H
#ifdef HAVE_CONFIG_H #include "nghttp2_config.h"
# include <config.h>
#endif /* HAVE_CONFIG_H */
void test_nghttp2_bufs_add(void); void test_nghttp2_bufs_add(void);
void test_nghttp2_bufs_add_stack_buffer_overflow_bug(void); void test_nghttp2_bufs_add_stack_buffer_overflow_bug(void);

View File

@ -25,9 +25,7 @@
#ifndef NGHTTP2_FRAME_TEST_H #ifndef NGHTTP2_FRAME_TEST_H
#define NGHTTP2_FRAME_TEST_H #define NGHTTP2_FRAME_TEST_H
#ifdef HAVE_CONFIG_H #include "nghttp2_config.h"
# include <config.h>
#endif /* HAVE_CONFIG_H */
void test_nghttp2_frame_pack_headers(void); void test_nghttp2_frame_pack_headers(void);
void test_nghttp2_frame_pack_headers_frame_too_large(void); void test_nghttp2_frame_pack_headers_frame_too_large(void);

View File

@ -25,9 +25,7 @@
#ifndef NGHTTP2_HD_TEST_H #ifndef NGHTTP2_HD_TEST_H
#define NGHTTP2_HD_TEST_H #define NGHTTP2_HD_TEST_H
#ifdef HAVE_CONFIG_H #include "nghttp2_config.h"
# include <config.h>
#endif /* HAVE_CONFIG_H */
void test_nghttp2_hd_deflate(void); void test_nghttp2_hd_deflate(void);
void test_nghttp2_hd_deflate_same_indexed_repr(void); void test_nghttp2_hd_deflate_same_indexed_repr(void);

View File

@ -25,9 +25,7 @@
#ifndef NGHTTP2_HELPER_TEST_H #ifndef NGHTTP2_HELPER_TEST_H
#define NGHTTP2_HELPER_TEST_H #define NGHTTP2_HELPER_TEST_H
#ifdef HAVE_CONFIG_H #include "nghttp2_config.h"
# include <config.h>
#endif /* HAVE_CONFIG_H */
void test_nghttp2_adjust_local_window_size(void); void test_nghttp2_adjust_local_window_size(void);
void test_nghttp2_check_header_name(void); void test_nghttp2_check_header_name(void);

View File

@ -25,9 +25,7 @@
#ifndef NGHTTP2_MAP_TEST_H #ifndef NGHTTP2_MAP_TEST_H
#define NGHTTP2_MAP_TEST_H #define NGHTTP2_MAP_TEST_H
#ifdef HAVE_CONFIG_H #include "nghttp2_config.h"
# include <config.h>
#endif /* HAVE_CONFIG_H */
void test_nghttp2_map(void); void test_nghttp2_map(void);
void test_nghttp2_map_functional(void); void test_nghttp2_map_functional(void);

View File

@ -25,9 +25,7 @@
#ifndef NGHTTP2_NPN_TEST_H #ifndef NGHTTP2_NPN_TEST_H
#define NGHTTP2_NPN_TEST_H #define NGHTTP2_NPN_TEST_H
#ifdef HAVE_CONFIG_H #include "nghttp2_config.h"
# include <config.h>
#endif /* HAVE_CONFIG_H */
void test_nghttp2_npn(void); void test_nghttp2_npn(void);

View File

@ -25,9 +25,7 @@
#ifndef NGHTTP2_PQ_TEST_H #ifndef NGHTTP2_PQ_TEST_H
#define NGHTTP2_PQ_TEST_H #define NGHTTP2_PQ_TEST_H
#ifdef HAVE_CONFIG_H #include "nghttp2_config.h"
# include <config.h>
#endif /* HAVE_CONFIG_H */
void test_nghttp2_pq(void); void test_nghttp2_pq(void);
void test_nghttp2_pq_update(void); void test_nghttp2_pq_update(void);

View File

@ -25,9 +25,7 @@
#ifndef NGHTTP2_QUEUE_TEST_H #ifndef NGHTTP2_QUEUE_TEST_H
#define NGHTTP2_QUEUE_TEST_H #define NGHTTP2_QUEUE_TEST_H
#ifdef HAVE_CONFIG_H #include "nghttp2_config.h"
# include <config.h>
#endif /* HAVE_CONFIG_H */
void test_nghttp2_queue(void); void test_nghttp2_queue(void);

View File

@ -25,9 +25,7 @@
#ifndef NGHTTP2_SESSION_TEST_H #ifndef NGHTTP2_SESSION_TEST_H
#define NGHTTP2_SESSION_TEST_H #define NGHTTP2_SESSION_TEST_H
#ifdef HAVE_CONFIG_H #include "nghttp2_config.h"
# include <config.h>
#endif /* HAVE_CONFIG_H */
void test_nghttp2_session_recv(void); void test_nghttp2_session_recv(void);
void test_nghttp2_session_recv_invalid_stream_id(void); void test_nghttp2_session_recv_invalid_stream_id(void);

View File

@ -25,8 +25,6 @@
#ifndef NGHTTP2_STREAM_TEST_H #ifndef NGHTTP2_STREAM_TEST_H
#define NGHTTP2_STREAM_TEST_H #define NGHTTP2_STREAM_TEST_H
#ifdef HAVE_CONFIG_H #include "nghttp2_config.h"
# include <config.h>
#endif /* HAVE_CONFIG_H */
#endif /* NGHTTP2_STREAM_TEST_H */ #endif /* NGHTTP2_STREAM_TEST_H */

View File

@ -25,9 +25,7 @@
#ifndef NGHTTP2_TEST_HELPER_H #ifndef NGHTTP2_TEST_HELPER_H
#define NGHTTP2_TEST_HELPER_H #define NGHTTP2_TEST_HELPER_H
#ifdef HAVE_CONFIG_H #include "nghttp2_config.h"
# include <config.h>
#endif /* HAVE_CONFIG_H */
#include "nghttp2_frame.h" #include "nghttp2_frame.h"
#include "nghttp2_hd.h" #include "nghttp2_hd.h"