mirror of
https://github.com/fmtlib/fmt.git
synced 2024-12-04 15:20:06 +00:00
Merge branch 'master' of github.com:fmtlib/fmt
This commit is contained in:
commit
63b23e786a
@ -22,8 +22,14 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
# include <io.h>
|
# if defined(NOMINMAX)
|
||||||
# include <windows.h>
|
# include <windows.h>
|
||||||
|
# else
|
||||||
|
# define NOMINMAX
|
||||||
|
# include <windows.h>
|
||||||
|
# undef NOMINMAX
|
||||||
|
# endif
|
||||||
|
# include <io.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef _MSC_VER
|
#ifdef _MSC_VER
|
||||||
|
Loading…
Reference in New Issue
Block a user