Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-02 06:22:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

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

Change-Id: Ic0b4eaf8def75148290eaf959ebf1998894179ef
This commit is contained in:
Android Build Prod User
2021-08-25 15:45:56 +00:00
committed by Automerger Merge Worker
parent ec30c30bcb c3835ade2a
commit 810b80e2b6
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
wifi/1.5/default/wifi.h
View File

@@ -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"