Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/blenlib/BLI_sys_types.h')
-rw-r--r--source/blender/blenlib/BLI_sys_types.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenlib/BLI_sys_types.h b/source/blender/blenlib/BLI_sys_types.h
index 96eb68e288e..e544006fd69 100644
--- a/source/blender/blenlib/BLI_sys_types.h
+++ b/source/blender/blenlib/BLI_sys_types.h
@@ -48,7 +48,7 @@ extern "C" {
#endif
/* MSVC 2010 and 2012 (>=1600) have stdint.h so we should use this for consistency */
-#if defined(_WIN32) && !defined(FREE_WINDOWS) && _MSC_VER <= 1500
+#if defined(_WIN32) && defined(_MSC_VER) && _MSC_VER <= 1500
/* The __intXX are built-in types of the visual compiler! So we don't
* need to include anything else here. */
@@ -101,7 +101,7 @@ typedef uint64_t u_int64_t;
#include <inttypes.h>
/* MinGW and MSVC >= 2010 */
-#elif defined(FREE_WINDOWS) || _MSC_VER >= 1600
+#elif defined(FREE_WINDOWS) || (defined(_MSC_VER) && _MSC_VER >= 1600)
#include <stdint.h>
#else