diff options
| author | Juergen Herrmann <shadowrom@me.com> | 2014-03-09 03:25:08 +0400 |
|---|---|---|
| committer | Juergen Herrmann <shadowrom@me.com> | 2014-03-09 03:25:08 +0400 |
| commit | 5559302369ae6a17e9ad5f3c8bd9ea6eb318d87f (patch) | |
| tree | b87db634a859b33aa0ddda978cb2b7f0c8a70c26 | |
| parent | 645aa96795b0ecc8f041fe20682d9b7b236009e4 (diff) | |
Cleanup some useless/unneeded #ifdefs for MSVC2013.
| -rw-r--r-- | intern/audaspace/intern/AUD_ConverterFunctions.h | 3 | ||||
| -rw-r--r-- | intern/elbeem/intern/mvmcoords.cpp | 2 | ||||
| -rw-r--r-- | source/blender/freestyle/intern/geometry/Grid.h | 2 | ||||
| -rw-r--r-- | source/blender/imbuf/intern/util.c | 2 |
4 files changed, 4 insertions, 5 deletions
diff --git a/intern/audaspace/intern/AUD_ConverterFunctions.h b/intern/audaspace/intern/AUD_ConverterFunctions.h index 1ffcf6c4ef0..99c03de42aa 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 281a9656fcf..838fc54491d 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 070bee047a9..aefe75f4842 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 7efd0223368..c1cc3f0a1db 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 |