commit 3cef7f7bfe33b4eabaa55ed8fc6b6cd571f9ddd6
author Ryan Prichard <rprichard@google.com> Thu Sep 07 21:09:05 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Sep 07 21:09:05 2023 +0000
tree 4bb52191b694e971853770f8e76f0172e5ab1f18
parent 5b8638c66c2113d13a2aaef505fa7a60b95f3811
parent 4dcd87fbef1b088713121dc064491efa8c8cab1c

Merge "[RESTRICT AUTOMERGE] Undefine NAN before defining it again" into main

wifi/1.6/default/wifi_feature_flags.cpp

diff --git a/wifi/1.6/default/wifi_feature_flags.cpp b/wifi/1.6/default/wifi_feature_flags.cpp
index e80a3cd..ff23e7c 100644
--- a/wifi/1.6/default/wifi_feature_flags.cpp
+++ b/wifi/1.6/default/wifi_feature_flags.cpp
@@ -136,6 +136,7 @@
 #define AP IfaceConcurrencyType::AP
 #define AP_BRIDGED IfaceConcurrencyType::AP_BRIDGED
 #define P2P IfaceConcurrencyType::P2P
+#undef NAN  // undefine NAN from math.h
 #define NAN IfaceConcurrencyType::NAN
 static const std::vector<V1_6::IWifiChip::ChipMode> kChipModesPrimary{
         {kMainModeId, ChipConcurrencyCombination::make_vec({WIFI_HAL_INTERFACE_COMBINATIONS})},