commit 236bbe33054c128df197c03c54a5cb56540c46e7
author Ryan Prichard <rprichard@google.com> Thu Sep 07 20:45:10 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Sep 07 20:45:10 2023 +0000
tree 82221b90fb443e244b6408c6220bd08664759388
parent c4e9e8e72ef7b5ae4408e1c30af6c78259c7e8d7
parent 99a4f3cf625a91463c5746989789042d7dcf93f2

Merge "Undefine NAN before defining it again" into aosp-main-future

wifi/aidl/default/wifi_feature_flags.cpp

diff --git a/wifi/aidl/default/wifi_feature_flags.cpp b/wifi/aidl/default/wifi_feature_flags.cpp
index 3c9f042..35b4b4a 100644
--- a/wifi/aidl/default/wifi_feature_flags.cpp
+++ b/wifi/aidl/default/wifi_feature_flags.cpp
@@ -122,6 +122,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_IFACE
 static const std::vector<IWifiChip::ChipMode> kChipModesPrimary{
         {kMainModeId, legacyToChipConcurrencyComboList({WIFI_HAL_INTERFACE_COMBINATIONS})},