From 71d6861d6a82c9eedbb9cfb8665a5d222eaf64bc Mon Sep 17 00:00:00 2001 From: David Cermak Date: Tue, 25 Sep 2018 10:34:04 +0200 Subject: [PATCH] tcp_transport: renamed transport related header files to esp_ prefixed to avoid collisions tcp_transport component used public header files such as 'transport.h', etc. which are too generic and might collide with user or user libraries headers This change closes #2417 --- components/mqtt/CMakeLists.txt | 11 +---------- components/mqtt/esp-mqtt | 2 +- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/components/mqtt/CMakeLists.txt b/components/mqtt/CMakeLists.txt index d100f80..85f63cc 100644 --- a/components/mqtt/CMakeLists.txt +++ b/components/mqtt/CMakeLists.txt @@ -3,17 +3,8 @@ set(COMPONENT_PRIV_INCLUDEDIRS "esp-mqtt/lib/include") set(COMPONENT_SRCS "esp-mqtt/mqtt_client.c" "esp-mqtt/lib/mqtt_msg.c" "esp-mqtt/lib/mqtt_outbox.c" - "esp-mqtt/lib/platform_esp32_idf.c" - "esp-mqtt/lib/transport_ws.c") + "esp-mqtt/lib/platform_esp32_idf.c") set(COMPONENT_REQUIRES lwip nghttp mbedtls tcp_transport) register_component() - -if(GCC_NOT_5_2_0) - # Temporary suppress "format-overflow" warning until we are fixed in esp-mqtt repo - set_source_files_properties( - esp-mqtt/lib/transport_ws.c - PROPERTIES COMPILE_FLAGS - -Wno-format-overflow) -endif() diff --git a/components/mqtt/esp-mqtt b/components/mqtt/esp-mqtt index bcb38e4..ca893e2 160000 --- a/components/mqtt/esp-mqtt +++ b/components/mqtt/esp-mqtt @@ -1 +1 @@ -Subproject commit bcb38e45f521085f997439a8b6c4ead34dff9043 +Subproject commit ca893e2c23a104cead0bb756a11af7b80464c2d4