tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Ryan Prichard 2023-09-07 21:09:05 +00:00 committed by Gerrit Code Review
commit 3cef7f7bfe
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
wifi/1.6/default/wifi_feature_flags.cpp
View file

@ -136,6 +136,7 @@ struct ChipConcurrencyCombination
#define AP IfaceConcurrencyType::AP #define AP IfaceConcurrencyType::AP
#define AP_BRIDGED IfaceConcurrencyType::AP_BRIDGED #define AP_BRIDGED IfaceConcurrencyType::AP_BRIDGED
#define P2P IfaceConcurrencyType::P2P #define P2P IfaceConcurrencyType::P2P
#undef NAN // undefine NAN from math.h
#define NAN IfaceConcurrencyType::NAN #define NAN IfaceConcurrencyType::NAN
static const std::vector<V1_6::IWifiChip::ChipMode> kChipModesPrimary{ static const std::vector<V1_6::IWifiChip::ChipMode> kChipModesPrimary{
{kMainModeId, ChipConcurrencyCombination::make_vec({WIFI_HAL_INTERFACE_COMBINATIONS})}, {kMainModeId, ChipConcurrencyCombination::make_vec({WIFI_HAL_INTERFACE_COMBINATIONS})},