diff --git a/include/fmt/format-inl.h b/include/fmt/format-inl.h index b1882dc5..8f5fb3dc 100644 --- a/include/fmt/format-inl.h +++ b/include/fmt/format-inl.h @@ -23,17 +23,15 @@ #endif #ifdef _WIN32 -# include +#include FMT_BEGIN_NAMESPACE - using DWORD = uint32_t; - using HANDLE = void*; - - extern "C" { - int __stdcall WriteConsoleW(void* hConsoleOutput, const void* lpBuffer, uint32_t nNumberOfCharsToWrite, uint32_t* lpNumberOfCharsWritten, void* lpReserved); - } + extern "C" { + int __stdcall WriteConsoleW(void* hConsoleOutput, const void* lpBuffer, uint32_t nNumberOfCharsToWrite, uint32_t* lpNumberOfCharsWritten, void* lpReserved); + } FMT_END_NAMESPACE #endif + // Dummy implementations of strerror_r and strerror_s called if corresponding // system functions are not available. inline fmt::detail::null<> strerror_r(int, char*, ...) { return {}; } @@ -2896,9 +2894,9 @@ FMT_FUNC void vprint(std::FILE* f, string_view format_str, format_args args) { auto fd = _fileno(f); if (_isatty(fd)) { detail::utf8_to_utf16 u16(string_view(buffer.data(), buffer.size())); - auto written = DWORD(); - if (!WriteConsoleW(reinterpret_cast(_get_osfhandle(fd)), - u16.c_str(), static_cast(u16.size()), &written, + auto written = uint32_t(); + if (!WriteConsoleW(reinterpret_cast(_get_osfhandle(fd)), + u16.c_str(), static_cast(u16.size()), &written, nullptr)) { FMT_THROW(format_error("failed to write to console")); }