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 "[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
parent 5b8638c66c 4dcd87fbef
commit 3cef7f7bfe
1 changed files with 1 additions and 0 deletions
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_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})},