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

Commit 02b3ca4e authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Undefine NAN after including it in Looper.h"

parents 599ce892 b99a3ccd
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.4/IWifi.h>

#include <android-base/macros.h>
#include <android/hardware/wifi/1.4/IWifi.h>
#include <utils/Looper.h>
#include <functional>

#include "hidl_callback_util.h"
#include "wifi_chip.h"