From 0f4d3e1bcaa6407383ef2099058d84ede8b31cbd Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Thu, 29 Aug 2019 18:16:50 -0500 Subject: [PATCH] Fix ESP32 "DISABLED" name conflict --- Marlin/src/HAL/HAL_ESP32/web.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Marlin/src/HAL/HAL_ESP32/web.cpp b/Marlin/src/HAL/HAL_ESP32/web.cpp index 8e4b9e510c..c593fc0242 100644 --- a/Marlin/src/HAL/HAL_ESP32/web.cpp +++ b/Marlin/src/HAL/HAL_ESP32/web.cpp @@ -22,12 +22,13 @@ #ifdef ARDUINO_ARCH_ESP32 +#include +#undef DISABLED // esp32-hal-gpio.h + #include "../../inc/MarlinConfigPre.h" #if ENABLED(WEBSUPPORT) -#include - #include "wifi.h" AsyncEventSource events("/events"); // event source (Server-Sent events)