From 05aa783779a6b81b72ab5662ffc1604728f5b371 Mon Sep 17 00:00:00 2001 From: hotwatermorning Date: Sun, 1 Oct 2023 14:51:23 +0900 Subject: [PATCH 1/3] feat: include xlocale.h only if exists --- include/fmt/os.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/fmt/os.h b/include/fmt/os.h index f3e81cfcf072..e5bd11aab967 100644 --- a/include/fmt/os.h +++ b/include/fmt/os.h @@ -13,7 +13,7 @@ #include #include // std::system_error -#if defined __APPLE__ || defined(__FreeBSD__) +#if (defined __APPLE__ || defined(__FreeBSD__)) && __has_include() # include // for LC_NUMERIC_MASK on OS X #endif From acaf83f40fd86814278a1f1b7d092a34a9c08442 Mon Sep 17 00:00:00 2001 From: hotwatermorning Date: Thu, 2 Nov 2023 20:42:05 +0900 Subject: [PATCH 2/3] feat: enable building with gcc 4.8 --- include/fmt/os.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/include/fmt/os.h b/include/fmt/os.h index e5bd11aab967..fd7015558cbc 100644 --- a/include/fmt/os.h +++ b/include/fmt/os.h @@ -13,8 +13,10 @@ #include #include // std::system_error -#if (defined __APPLE__ || defined(__FreeBSD__)) && __has_include() -# include // for LC_NUMERIC_MASK on OS X +#if defined __APPLE__ || defined(__FreeBSD__) +# if (__cplusplus < 201703L) || __has_include() +# include // for LC_NUMERIC_MASK on OS X +# endif #endif #include "format.h" From b345027fcb0fdf77c1910f90bc8516c2866ffb8e Mon Sep 17 00:00:00 2001 From: hotwatermorning Date: Fri, 3 Nov 2023 02:40:39 +0900 Subject: [PATCH 3/3] fix: use FMT_HAS_INCLUDE instead of __has_include --- include/fmt/os.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/fmt/os.h b/include/fmt/os.h index fd7015558cbc..db50ce2b8562 100644 --- a/include/fmt/os.h +++ b/include/fmt/os.h @@ -13,8 +13,10 @@ #include #include // std::system_error +#include "core.h" + #if defined __APPLE__ || defined(__FreeBSD__) -# if (__cplusplus < 201703L) || __has_include() +# if FMT_HAS_INCLUDE() # include // for LC_NUMERIC_MASK on OS X # endif #endif