Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c3835ade authored by Android Build Prod User's avatar Android Build Prod User Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: Idb40c95d92d17a3f4f3198c603b74b1698cd74e1
parents 5b4752b8 a40db334
Loading
Loading
Loading
Loading
+6 −2
Original line number Diff line number Diff line
@@ -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"