From 80ff2867b74d152dd8fc9e5aa32931f0e3c3b233 Mon Sep 17 00:00:00 2001 From: Boris Zbarsky Date: Wed, 13 Sep 2023 15:01:08 -0400 Subject: [PATCH] Fix CHIPConfig.h not including InetConfig.h. We had various things that were testing config bits that InetConfig.h would pull in that never actually included InetConfig.h, because CHIPConfig.h did not include it. --- src/lib/core/BUILD.gn | 1 + src/lib/core/CHIPConfig.h | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/lib/core/BUILD.gn b/src/lib/core/BUILD.gn index 5a08f7d1935a23..60f56af7e5850b 100644 --- a/src/lib/core/BUILD.gn +++ b/src/lib/core/BUILD.gn @@ -75,6 +75,7 @@ source_set("chip_config_header") { public_deps = [ ":chip_buildconfig", "${chip_root}/src/ble:ble_config_header", + "${chip_root}/src/inet:inet_config_header", "${chip_root}/src/system:system_config_header", ] diff --git a/src/lib/core/CHIPConfig.h b/src/lib/core/CHIPConfig.h index 14453c98a02d73..59a6e8252356bf 100644 --- a/src/lib/core/CHIPConfig.h +++ b/src/lib/core/CHIPConfig.h @@ -42,8 +42,8 @@ #include #include -/* COMING SOON: making the INET Layer optional entails making this inclusion optional. */ -// #include "InetConfig.h" +#include + /* #if INET_CONFIG_ENABLE_TCP_ENDPOINT && INET_TCP_IDLE_CHECK_INTERVAL <= 0 #error "chip SDK requires INET_TCP_IDLE_CHECK_INTERVAL > 0"