Commit: 5559302369ae6a17e9ad5f3c8bd9ea6eb318d87f
Author: Juergen Herrmann
Date: Sun Mar 9 00:25:08 2014 +0100
https://developer.blender.org/rB5559302369ae6a17e9ad5f3c8bd9ea6eb318d87f
Cleanup some useless/unneeded #ifdefs for MSVC2013.
===================================================================
M intern/audaspace/intern/AUD_ConverterFunctions.h
M intern/elbeem/intern/mvmcoords.cpp
M source/blender/freestyle/intern/geometry/Grid.h
M source/blender/imbuf/intern/util.c
===================================================================
diff --git a/intern/audaspace/intern/AUD_ConverterFunctions.h
b/intern/audaspace/intern/AUD_ConverterFunctions.h
index 1ffcf6c..99c03de 100644
--- a/intern/audaspace/intern/AUD_ConverterFunctions.h
+++ b/intern/audaspace/intern/AUD_ConverterFunctions.h
@@ -38,8 +38,7 @@
typedef short int16_t;
typedef int int32_t;
#else
- typedef __int16 int16_t;
- typedef __int32 int32_t;
+# include <stdint.h>
#endif
#else
#include <stdint.h>
diff --git a/intern/elbeem/intern/mvmcoords.cpp
b/intern/elbeem/intern/mvmcoords.cpp
index 281a965..838fc54 100644
--- a/intern/elbeem/intern/mvmcoords.cpp
+++ b/intern/elbeem/intern/mvmcoords.cpp
@@ -18,7 +18,7 @@
#include <algorithm>
#if defined(_MSC_VER) && _MSC_VER > 1600
-// sdt::greater
+// std::greater
#include <functional>
#endif
diff --git a/source/blender/freestyle/intern/geometry/Grid.h
b/source/blender/freestyle/intern/geometry/Grid.h
index 070bee0..aefe75f 100644
--- a/source/blender/freestyle/intern/geometry/Grid.h
+++ b/source/blender/freestyle/intern/geometry/Grid.h
@@ -30,7 +30,7 @@
#include <cstring> // for memset
#include <float.h>
-#ifndef _MSC_VER
+#ifdef _MSC_VER
#include <stdint.h> // For SET_UINT_IN_POINTER, i.e. uintptr_t.
#endif
#include <vector>
diff --git a/source/blender/imbuf/intern/util.c
b/source/blender/imbuf/intern/util.c
index 7efd022..c1cc3f0 100644
--- a/source/blender/imbuf/intern/util.c
+++ b/source/blender/imbuf/intern/util.c
@@ -252,7 +252,7 @@ static int isqtime(const char *name)
#ifdef WITH_FFMPEG
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && _MSC_VER < 1800
#define va_copy(dst, src) ((dst) = (src))
#endif
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
