Unverified Commit 253d6315 authored by Bernd Baumanns's avatar Bernd Baumanns Committed by GitHub

Remove dependency on windows.h (#1900)

parent c156093f
...@@ -23,16 +23,23 @@ ...@@ -23,16 +23,23 @@
#endif #endif
#ifdef _WIN32 #ifdef _WIN32
# if defined(FMT_BIG_WIN) || defined(NOMINMAX) # include <io.h>
# include <windows.h> FMT_BEGIN_NAMESPACE
namespace details {
# if !defined(__LP64__)
using DWORD = unsigned long;
# else # else
# define NOMINMAX using DWORD = unsigned int;
# define WIN32_LEAN_AND_MEAN
# include <windows.h>
# undef WIN32_LEAN_AND_MEAN
# undef NOMINMAX
# endif # endif
# include <io.h> // WriteConsoleW should not become visible in global namespace
extern "C" {
int __stdcall WriteConsoleW(void* hConsoleOutput, const void* lpBuffer,
DWORD nNumberOfCharsToWrite,
DWORD* lpNumberOfCharsWritten, void* lpReserved);
}
} // namespace details
FMT_END_NAMESPACE
#endif #endif
// Dummy implementations of strerror_r and strerror_s called if corresponding // Dummy implementations of strerror_r and strerror_s called if corresponding
...@@ -2897,10 +2904,10 @@ FMT_FUNC void vprint(std::FILE* f, string_view format_str, format_args args) { ...@@ -2897,10 +2904,10 @@ FMT_FUNC void vprint(std::FILE* f, string_view format_str, format_args args) {
auto fd = _fileno(f); auto fd = _fileno(f);
if (_isatty(fd)) { if (_isatty(fd)) {
detail::utf8_to_utf16 u16(string_view(buffer.data(), buffer.size())); detail::utf8_to_utf16 u16(string_view(buffer.data(), buffer.size()));
auto written = DWORD(); auto written = details::DWORD();
if (!WriteConsoleW(reinterpret_cast<HANDLE>(_get_osfhandle(fd)), if (!details::WriteConsoleW(
u16.c_str(), static_cast<DWORD>(u16.size()), &written, reinterpret_cast<void*>(_get_osfhandle(fd)), u16.c_str(),
nullptr)) { static_cast<details::DWORD>(u16.size()), &written, nullptr)) {
FMT_THROW(format_error("failed to write to console")); FMT_THROW(format_error("failed to write to console"));
} }
return; return;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment