Skip to content

Commit

Permalink
Fix custom version file include
Browse files Browse the repository at this point in the history
  • Loading branch information
thinkyhead committed Mar 22, 2020
1 parent 2c325c2 commit 2460a3d
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
4 changes: 4 additions & 0 deletions Marlin/src/core/macros.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@
*/
#pragma once

#if !defined(__has_include)
#define __has_include(...) 1
#endif

#define ABCE 4
#define XYZE 4
#define ABC 3
Expand Down
8 changes: 2 additions & 6 deletions Marlin/src/inc/MarlinConfigPre.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,8 @@
#include "../../Configuration.h"

#ifdef CUSTOM_VERSION_FILE
#if defined(__has_include)
#if __has_include(XSTR(../../CUSTOM_VERSION_FILE))
#include XSTR(../../CUSTOM_VERSION_FILE)
#endif
#else
#include XSTR(../../CUSTOM_VERSION_FILE)
#if __has_include(STRINGIFY(../../CUSTOM_VERSION_FILE))
#include STRINGIFY(../../CUSTOM_VERSION_FILE)
#endif
#endif

Expand Down

0 comments on commit 2460a3d

Please sign in to comment.