From 9418b4f2f3221e361039a664176f534d102583ca Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sun, 13 Mar 2016 23:15:17 -0700 Subject: [PATCH] Promote STRINGIFY to macros.h --- Marlin/language.h | 7 +------ Marlin/macros.h | 4 ++++ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Marlin/language.h b/Marlin/language.h index e1e3d48cb..e0fb3d9f2 100644 --- a/Marlin/language.h +++ b/Marlin/language.h @@ -3,8 +3,7 @@ #include "Configuration.h" -#define LANGUAGE_CONCAT(M) #M -#define GENERATE_LANGUAGE_INCLUDE(M) LANGUAGE_CONCAT(language_##M.h) +#define GENERATE_LANGUAGE_INCLUDE(M) STRINGIFY_(language_##M.h) // NOTE: IF YOU CHANGE LANGUAGE FILES OR MERGE A FILE WITH CHANGES @@ -88,10 +87,6 @@ #endif -#define STRINGIFY_(n) #n -#define STRINGIFY(n) STRINGIFY_(n) - - // Common LCD messages /* nothing here yet */ diff --git a/Marlin/macros.h b/Marlin/macros.h index 4e974a56c..5a202de6f 100644 --- a/Marlin/macros.h +++ b/Marlin/macros.h @@ -1,6 +1,10 @@ #ifndef MACROS_H #define MACROS_H +// Macros to make a string from a macro +#define STRINGIFY_(n) #n +#define STRINGIFY(n) STRINGIFY_(n) + // Macros for bit masks #define TEST(n,b) (((n)&_BV(b))!=0) #define SBI(n,b) (n |= _BV(b))