[Bf-blender-cvs] [939dd2e] master: Skip some more workarounds when using MSVC 2015
Martijn Berger
noreply at git.blender.org
Wed Dec 30 11:27:08 CET 2015
Commit: 939dd2e168c2ba9578f3ca69ba677347aa026fd0
Author: Martijn Berger
Date: Wed Dec 30 11:23:10 2015 +0100
Branches: master
https://developer.blender.org/rB939dd2e168c2ba9578f3ca69ba677347aa026fd0
Skip some more workarounds when using MSVC 2015
===================================================================
M intern/dualcon/intern/Projections.h
===================================================================
diff --git a/intern/dualcon/intern/Projections.h b/intern/dualcon/intern/Projections.h
index a5086dd..2d1eca5 100644
--- a/intern/dualcon/intern/Projections.h
+++ b/intern/dualcon/intern/Projections.h
@@ -29,7 +29,7 @@
#define CONTAINS_INDEX
#define GRID_DIMENSION 20
-#if defined(_WIN32) && !defined(__MINGW32__)
+#if defined(_WIN32) && !defined(__MINGW32__) && !(_MSC_VER >= 1900)
#define isnan(n) _isnan(n)
#define LONG __int64
#define int64_t __int64
More information about the Bf-blender-cvs
mailing list