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

[RESTRICT AUTOMERGE] Undefine NAN before defining it again

Browse Source 
After upgrading libc++, math.h happens to be included at the point
where this file tries to define NAN. Redefining a macro to a different
value is an error, but #undef'ing a macro is OK even if the macro isn't
actually defined.

Bug: b/175635923
Test: treehugger
Change-Id: Ie8e3e87189bcd7ed8fccccfc0a79e04a5bfda16b
Merged-In: Ie8e3e87189bcd7ed8fccccfc0a79e04a5bfda16b
This commit is contained in:
Ryan Prichard
2023-09-06 18:41:45 -07:00
parent 37fb2fe77d
commit 4dcd87fbef
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})},