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

This commit is contained in:
Ryan Prichard 2023-09-07 21:09:05 +00:00 committed by Gerrit Code Review
commit 3cef7f7bfe

View file

@ -136,6 +136,7 @@ struct ChipConcurrencyCombination
#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})},