Merge branch 'bugfix/changes_in_idf_to_make_compatible_with_wolfssl' into 'master'

Bugfix/changes in idf to make compatible with wolfssl See merge request espressif/esp-idf!6149
2019-10-02 14:05:10 +08:00 · 2019-10-02 14:05:10 +08:00 · c2a9f0643e
parent 1c1108d47b 3f9b0d8c2a
commit c2a9f0643e
3 changed files with 4 additions and 1 deletions
--- a/components/nghttp/CMakeLists.txt
+++ b/components/nghttp/CMakeLists.txt
@ -24,6 +24,7 @@ set(srcs
    "port/http_parser.c")

 idf_component_register(SRCS "${srcs}"
-                    INCLUDE_DIRS port/include nghttp2/lib/includes)
+                    INCLUDE_DIRS port/include nghttp2/lib/includes
+                    PRIV_INCLUDE_DIRS private_include)

 target_compile_definitions(${COMPONENT_LIB} PUBLIC "-DHAVE_CONFIG_H")
--- a/components/nghttp/component.mk
+++ b/components/nghttp/component.mk
@ -4,6 +4,8 @@

 COMPONENT_ADD_INCLUDEDIRS := port/include nghttp2/lib/includes

+COMPONENT_PRIV_INCLUDEDIRS := private_include
+
 COMPONENT_SRCDIRS := nghttp2/lib port

 COMPONENT_SUBMODULES := nghttp2
--- a/components/nghttp/private_include/config.h
+++ b/components/nghttp/private_include/config.h