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

Commit 236bbe33 authored by Ryan Prichard's avatar Ryan Prichard Committed by Android (Google) Code Review
Browse files

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

parents c4e9e8e7 99a4f3cf

wifi/aidl/default/wifi_feature_flags.cpp

+1 −0
Original line number Diff line number Diff line
@@ -122,6 +122,7 @@ std::vector<IWifiChip::ChipConcurrencyCombination> legacyToChipConcurrencyComboL 
#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})},