Merge 69366d4001 into 7d463a7f78

10 years ago · c91a387d7e
parent 7d463a7f78 69366d4001
commit c91a387d7e
1 changed files with 2 additions and 0 deletions
--- a/include/spdlog/details/format.h
+++ b/include/spdlog/details/format.h
@ -947,7 +947,9 @@ class MakeValue : public Arg {

  FMT_MAKE_VALUE(bool, int_value, BOOL)
  FMT_MAKE_VALUE(short, int_value, INT)
+#if !defined(_MSC_VER) || defined(_NATIVE_WCHAR_T_DEFINED)
  FMT_MAKE_VALUE(unsigned short, uint_value, UINT)
+#endif
  FMT_MAKE_VALUE(int, int_value, INT)
  FMT_MAKE_VALUE(unsigned, uint_value, UINT)