From a4a0887fa79f096e38b87f50f01b3995d0874234 Mon Sep 17 00:00:00 2001 From: Mihai <299015+mh-dm@users.noreply.github.com> Date: Wed, 29 May 2024 02:22:39 +0300 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Fix=20NONE,=20ALL,=20EVAL=20macr?= =?UTF-8?q?o=20collision=20(#27132)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Marlin/src/core/macros.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Marlin/src/core/macros.h b/Marlin/src/core/macros.h index 4f1aba23c8..5d2f4f0de1 100644 --- a/Marlin/src/core/macros.h +++ b/Marlin/src/core/macros.h @@ -197,8 +197,8 @@ #define ENABLED(V...) DO(ENA,&&,V) #define DISABLED(V...) DO(DIS,&&,V) #define ANY(V...) !DISABLED(V) -#define ALL ENABLED -#define NONE DISABLED +#define ALL(V...) ENABLED(V) +#define NONE(V...) DISABLED(V) #define COUNT_ENABLED(V...) DO(ENA,+,V) #define MANY(V...) (COUNT_ENABLED(V) > 1) @@ -630,7 +630,7 @@ #define DEFER4(M) M EMPTY EMPTY EMPTY EMPTY()()()() // Force define expansion -#define EVAL EVAL16 +#define EVAL(V...) EVAL16(V) #define EVAL4096(V...) EVAL2048(EVAL2048(V)) #define EVAL2048(V...) EVAL1024(EVAL1024(V)) #define EVAL1024(V...) EVAL512(EVAL512(V))