commit 0b7f1411c9abd6a163818248f0865e975ef69736
author MITSUNARI Shigeo <herumi@nifty.com> Mon Oct 05 08:29:40 2020 +0900
committer MITSUNARI Shigeo <herumi@nifty.com> Mon Oct 05 08:29:40 2020 +0900
tree 68932390a04e475cc792a42eb22d8b6cc149aa67
parent 87e8f41aee53b3b9c66cb3f4a30a4665910486ee
parent b0a43c7e5b5213889529d17a11d6e8fc15406044

Merge branch 'use-sh' of https://github.com/kariya-mitsuru/xbyak into kariya-mitsuru-use-sh

xbyak/xbyak.h

diff --git a/xbyak/xbyak.h b/xbyak/xbyak.h
index 4310455..481ec9b 100644
--- a/xbyak/xbyak.h
+++ b/xbyak/xbyak.h
@@ -108,7 +108,7 @@
 	#endif
 #endif
 
-#if (__cplusplus >= 201103) || (_MSC_VER >= 1800)
+#if (__cplusplus >= 201103) || (defined(_MSC_VER) && _MSC_VER >= 1800)
 	#undef XBYAK_TLS
 	#define XBYAK_TLS thread_local
 	#define XBYAK_VARIADIC_TEMPLATE
@@ -117,7 +117,7 @@
 	#define XBYAK_NOEXCEPT throw()
 #endif
 
-#if (__cplusplus >= 201402L) || (_MSC_VER >= 1910) // Visual Studio 2017 version 15.0
+#if (__cplusplus >= 201402L) || (defined(_MSC_VER) && _MSC_VER >= 1910) // Visual Studio 2017 version 15.0
 	#define XBYAK_CONSTEXPR constexpr // require c++14 or later
 #else
 	#define XBYAK_CONSTEXPR