commit 22b45dc4380f72a30651313b5733236aa9e47e90
author Linux Build Service Account <lnxbuild@localhost> Fri May 21 05:42:55 2021 -0700
committer Linux Build Service Account <lnxbuild@localhost> Fri May 21 05:42:55 2021 -0700
tree d7fbe3b3b5b3829d13303b345ee09a2b0f6322d4
parent e5d69e74582f8c8e2a3ff70b8a073e930c143a11
parent 72a78d04fa8899c1e21988346c85f0ed5c574b91

Merge 72a78d04fa8899c1e21988346c85f0ed5c574b91 on remote branch

Change-Id: Ifa4783cf8cc56d863fd9f9ae4927daecab46108a

sigma_dut.h

diff --git a/sigma_dut.h b/sigma_dut.h
index 5a07e18..f78d148 100644
--- a/sigma_dut.h
+++ b/sigma_dut.h
@@ -42,7 +42,14 @@
 #include "nl80211_copy.h"
 #endif /* NL80211_SUPPORT */
 #ifdef ANDROID_WIFI_HAL
+/* avoid duplicate definitions from wifi_hal.h causing issues */
+#define u32 wifi_hal_u32
+#define u16 wifi_hal_u16
+#define u8 wifi_hal_u8
 #include "wifi_hal.h"
+#undef u32
+#undef u16
+#undef u8
 #endif /*ANDROID_WIFI_HAL*/
 
 #ifdef NL80211_SUPPORT