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

This commit is contained in:
Android Build Prod User
2021-08-25 15:15:47 +00:00
committed by Android (Google) Code Review

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"