| commit | 3e5ee9a6e622ea0bb7ceca6415cd9a941018c9ef | [log] [tgz] |
|---|---|---|
| author | Ryan Prichard <rprichard@google.com> | Thu Sep 07 21:23:50 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 07 21:23:50 2023 +0000 |
| tree | fcf3c34f5ec1fc8d37f615545fe53d7f0e336b39 | |
| parent | 0cd042eadbe9becf851eaa3e60452191ee456802 [diff] | |
| parent | 236bbe33054c128df197c03c54a5cb56540c46e7 [diff] |
Merge "Undefine NAN before defining it again" into aosp-main-future am: 236bbe3305 Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24685603 Change-Id: I69ab8927b8f8b4fc4ad559c9a65a8f4a58a4e893 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})},