From e8b7f4194add85e163ced9d2bb1ff6a6dca04920 Mon Sep 17 00:00:00 2001 From: fogo Date: Mon, 9 Oct 2017 19:59:02 -0300 Subject: [PATCH] Moved printf include to fmt.h --- include/spdlog/details/logger_impl.h | 8 -------- include/spdlog/fmt/fmt.h | 6 ++++++ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/include/spdlog/details/logger_impl.h b/include/spdlog/details/logger_impl.h index dbbba16f..d0f4a9d5 100644 --- a/include/spdlog/details/logger_impl.h +++ b/include/spdlog/details/logger_impl.h @@ -8,14 +8,6 @@ #include "spdlog/logger.h" #include "spdlog/sinks/stdout_sinks.h" -#if defined(SPDLOG_FMT_PRINTF) -#if !defined(SPDLOG_FMT_EXTERNAL) -#include "spdlog/fmt/bundled/printf.h" -#else //external fmtlib -#include -#endif -#endif - #include #include diff --git a/include/spdlog/fmt/fmt.h b/include/spdlog/fmt/fmt.h index a4ee4673..6322ba6a 100644 --- a/include/spdlog/fmt/fmt.h +++ b/include/spdlog/fmt/fmt.h @@ -19,10 +19,16 @@ #define FMT_USE_WINDOWS_H 0 #endif #include "spdlog/fmt/bundled/format.h" +#if defined(SPDLOG_FMT_PRINTF) +#include "spdlog/fmt/bundled/printf.h" +#endif #else //external fmtlib #include +#if defined(SPDLOG_FMT_PRINTF) +#include +#endif #endif