Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 11:36:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Ryan Prichard
2023-09-07 20:45:10 +00:00
committed by Android (Google) Code Review
parent c4e9e8e72e 99a4f3cf62
commit 236bbe3305
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
wifi/aidl/default/wifi_feature_flags.cpp
View File

@@ -122,6 +122,7 @@ std::vector<IWifiChip::ChipConcurrencyCombination> legacyToChipConcurrencyComboL
#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_IFACE #define NAN IfaceConcurrencyType::NAN_IFACE
static const std::vector<IWifiChip::ChipMode> kChipModesPrimary{ static const std::vector<IWifiChip::ChipMode> kChipModesPrimary{
{kMainModeId, legacyToChipConcurrencyComboList({WIFI_HAL_INTERFACE_COMBINATIONS})}, {kMainModeId, legacyToChipConcurrencyComboList({WIFI_HAL_INTERFACE_COMBINATIONS})},