Ensure language.h include order

See #17604
2020-04-20 09:43:15 -05:00
parent 875cd4e081
commit 000ec9fc13
13 changed files with 7 additions and 18 deletions
--- a/Marlin/src/core/language.h
+++ b/Marlin/src/core/language.h
@@ -81,11 +81,9 @@
 #ifdef CUSTOM_MACHINE_NAME
  #undef  MACHINE_NAME
  #define MACHINE_NAME CUSTOM_MACHINE_NAME
-#else
-  #ifdef DEFAULT_MACHINE_NAME
-    #undef  MACHINE_NAME
-    #define MACHINE_NAME DEFAULT_MACHINE_NAME
-  #endif
+#elif defined(DEFAULT_MACHINE_NAME)
+  #undef  MACHINE_NAME
+  #define MACHINE_NAME DEFAULT_MACHINE_NAME
 #endif

 #ifndef MACHINE_UUID
--- a/Marlin/src/core/serial.cpp
+++ b/Marlin/src/core/serial.cpp
@@ -21,7 +21,7 @@
 */

 #include "serial.h"
-#include "language.h"
+#include "../inc/MarlinConfig.h"

 uint8_t marlin_debug_flags = MARLIN_DEBUG_NONE;