From 0562e73dfa31fd9a4b940aed147d499109476920 Mon Sep 17 00:00:00 2001 From: Dair Grant Date: Sat, 29 Feb 2020 23:41:41 +0000 Subject: [PATCH] Move FMT_CLANG_VERSION definition to core.h Previously format.h defined FMT_CLANG_VERSION after including core.h, however core.h tests FMT_CLANG_VERSION when it defines FMT_API. --- include/fmt/core.h | 6 ++++++ include/fmt/format.h | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/fmt/core.h b/include/fmt/core.h index 76fedf05..0424c85b 100644 --- a/include/fmt/core.h +++ b/include/fmt/core.h @@ -36,6 +36,12 @@ # define FMT_HAS_CPP_ATTRIBUTE(x) 0 #endif +#ifdef __clang__ +# define FMT_CLANG_VERSION (__clang_major__ * 100 + __clang_minor__) +#else +# define FMT_CLANG_VERSION 0 +#endif + #if defined(__GNUC__) && !defined(__clang__) # define FMT_GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__) #else diff --git a/include/fmt/format.h b/include/fmt/format.h index ed87ea3d..acd7d9dc 100644 --- a/include/fmt/format.h +++ b/include/fmt/format.h @@ -43,12 +43,6 @@ #include "core.h" -#ifdef __clang__ -# define FMT_CLANG_VERSION (__clang_major__ * 100 + __clang_minor__) -#else -# define FMT_CLANG_VERSION 0 -#endif - #ifdef __INTEL_COMPILER # define FMT_ICC_VERSION __INTEL_COMPILER #elif defined(__ICL)