Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3cef7f7b authored by Ryan Prichard's avatar Ryan Prichard Committed by Gerrit Code Review
Browse files

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

parents 5b8638c6 4dcd87fb

wifi/1.6/default/wifi_feature_flags.cpp

+1 −0
Original line number Diff line number Diff line
@@ -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})},