| commit | c5ba9b1abda9cbe2d510799f3c0f699623db5bc0 | [log] [tgz] |
|---|---|---|
| author | Ryan Prichard <rprichard@google.com> | Thu Sep 07 22:48:54 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 07 22:48:54 2023 +0000 |
| tree | 65259606462a06ac06189189ac2de2d887df35a3 | |
| parent | d06e491face2814a872aab657937abd2132419b6 [diff] | |
| parent | 5742e2ba25a75243ec0a644cf8bad788a310e5d4 [diff] |
Merge "Undefine NAN before defining it again" into aosp-main-future am: 236bbe3305 am: 3e5ee9a6e6 am: 5742e2ba25 Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24685603 Change-Id: I262b7ff132cfcd1bd8d21d6528d13d76fc075998 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/wifi/aidl/default/wifi_feature_flags.cpp b/wifi/aidl/default/wifi_feature_flags.cpp index 3c9f042..35b4b4a 100644 --- a/wifi/aidl/default/wifi_feature_flags.cpp +++ b/wifi/aidl/default/wifi_feature_flags.cpp
@@ -122,6 +122,7 @@ #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})},