diff --git a/far/changelog b/far/changelog index 08a2f9048e..458554df96 100644 --- a/far/changelog +++ b/far/changelog @@ -1,3 +1,8 @@ +-------------------------------------------------------------------------------- +yjh 2024-01-05 23:58:39+03:00 - build 6248 + +1. fmt v10.2.1 + -------------------------------------------------------------------------------- zg 2024-01-05 09:36:01+02:00 - build 6247 diff --git a/far/thirdparty/fmt/fmt/core.h b/far/thirdparty/fmt/fmt/core.h index 94f3f22b4f..b51c1406a9 100644 --- a/far/thirdparty/fmt/fmt/core.h +++ b/far/thirdparty/fmt/fmt/core.h @@ -18,7 +18,7 @@ #include // The fmt library version in the form major * 10000 + minor * 100 + patch. -#define FMT_VERSION 100200 +#define FMT_VERSION 100201 #if defined(__clang__) && !defined(__ibmxl__) # define FMT_CLANG_VERSION (__clang_major__ * 100 + __clang_minor__) diff --git a/far/thirdparty/fmt/fmt/format-inl.h b/far/thirdparty/fmt/fmt/format-inl.h index e9a4ca453a..efac5d1f88 100644 --- a/far/thirdparty/fmt/fmt/format-inl.h +++ b/far/thirdparty/fmt/fmt/format-inl.h @@ -1434,6 +1434,7 @@ FMT_FUNC auto vformat(string_view fmt, format_args args) -> std::string { namespace detail { #if !defined(_WIN32) || defined(FMT_WINDOWS_NO_WCHAR) FMT_FUNC auto write_console(int, string_view) -> bool { return false; } +FMT_FUNC auto write_console(std::FILE*, string_view) -> bool { return false; } #else using dword = conditional_t; extern "C" __declspec(dllimport) int __stdcall WriteConsoleW( // @@ -1444,6 +1445,10 @@ FMT_FUNC bool write_console(int fd, string_view text) { return WriteConsoleW(reinterpret_cast(_get_osfhandle(fd)), u16.c_str(), static_cast(u16.size()), nullptr, nullptr) != 0; } + +FMT_FUNC auto write_console(std::FILE* f, string_view text) -> bool { + return write_console(_fileno(f), text); +} #endif #ifdef _WIN32 diff --git a/far/thirdparty/fmt/fmt/format.h b/far/thirdparty/fmt/fmt/format.h index 97f0e1fb12..7637c8a0d0 100644 --- a/far/thirdparty/fmt/fmt/format.h +++ b/far/thirdparty/fmt/fmt/format.h @@ -999,6 +999,7 @@ struct is_contiguous> : std::true_type { FMT_END_EXPORT namespace detail { FMT_API auto write_console(int fd, string_view text) -> bool; +FMT_API auto write_console(std::FILE* f, string_view text) -> bool; FMT_API void print(std::FILE*, string_view); } // namespace detail diff --git a/far/vbuild.m4 b/far/vbuild.m4 index 861ef7370f..cbc797e5ef 100644 --- a/far/vbuild.m4 +++ b/far/vbuild.m4 @@ -1 +1 @@ -6247 +6248