From 2ce8047adb30cf70a58f39d828f6804e47a7feb6 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Tue, 15 May 2018 00:00:53 -0500
Subject: [PATCH] Head off potential LCD-related compile issues
---
Marlin/ultralcd.cpp | 2 +-
Marlin/ultralcd.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp
index 028238cc1e..0865c6e13a 100644
--- a/Marlin/ultralcd.cpp
+++ b/Marlin/ultralcd.cpp
@@ -4857,7 +4857,7 @@ void lcd_quick_feedback(const bool clear_buttons) {
callbackFunc = callback; \
liveEdit = live; \
} \
- typedef void _name
+ typedef void _name##_void
DEFINE_MENU_EDIT_TYPE(int16_t, int3, itostr3, 1);
DEFINE_MENU_EDIT_TYPE(uint8_t, int8, i8tostr3, 1);
diff --git a/Marlin/ultralcd.h b/Marlin/ultralcd.h
index bf7ae0fef0..a37da89c61 100644
--- a/Marlin/ultralcd.h
+++ b/Marlin/ultralcd.h
@@ -220,7 +220,7 @@
EN_REPRAPWORLD_KEYPAD_LEFT) \
)
- #elif ENABLED(NEWPANEL)
+ #elif defined(EN_C)
#define LCD_CLICKED (buttons & EN_C)
--
GitLab