commit 810b80e2b6134f0dfb46162434103df6c6c41e70
author Android Build Prod User <android-build-prod@system.gserviceaccount.com> Wed Aug 25 15:45:56 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Aug 25 15:45:56 2021 +0000
tree c6775342d67cf53c77c9de058af3a56519fd7676
parent ec30c30bcb87c1686856418ee52a2a512ceb624e
parent c3835ade2a78d641d33185d5c8887566d706ae25

Merge "Undefine NAN after including it in Looper.h" into sc-dev-plus-aosp am: a40db3343c am: c3835ade2a

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/15667249

Change-Id: Ic0b4eaf8def75148290eaf959ebf1998894179ef

wifi/1.5/default/wifi.h

diff --git a/wifi/1.5/default/wifi.h b/wifi/1.5/default/wifi.h
index 840bdfd..c94ef3f 100644
--- a/wifi/1.5/default/wifi.h
+++ b/wifi/1.5/default/wifi.h
@@ -17,11 +17,15 @@
 #ifndef WIFI_H_
 #define WIFI_H_
 
-#include <functional>
+// HACK: NAN is a macro defined in math.h, which can be included in various
+// headers. This wifi HAL uses an enum called NAN, which does not compile when
+// the macro is defined. Undefine NAN to work around it.
+#undef NAN
+#include <android/hardware/wifi/1.5/IWifi.h>
 
 #include <android-base/macros.h>
-#include <android/hardware/wifi/1.5/IWifi.h>
 #include <utils/Looper.h>
+#include <functional>
 
 #include "hidl_callback_util.h"
 #include "wifi_chip.h"