kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Cleanup some useless/unneeded #ifdefs for MSVC2013.

Browse Source
This commit is contained in:
Juergen Herrmann 2014-03-09 00:25:08 +01:00
parent 645aa96795
commit 5559302369
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
intern/audaspace/intern/AUD_ConverterFunctions.h
View File

@ -38,8 +38,7 @@
typedef short int16_t; typedef short int16_t;
typedef int int32_t; typedef int int32_t;
#else #else
typedef __int16 int16_t; # include <stdint.h>
typedef __int32 int32_t;
#endif #endif
#else #else
#include <stdint.h> #include <stdint.h>

2
intern/elbeem/intern/mvmcoords.cpp
View File

@ -18,7 +18,7 @@
#include <algorithm> #include <algorithm>
#if defined(_MSC_VER) && _MSC_VER > 1600 #if defined(_MSC_VER) && _MSC_VER > 1600
// sdt::greater // std::greater
#include <functional> #include <functional>
#endif #endif

2
source/blender/freestyle/intern/geometry/Grid.h
View File

@ -30,7 +30,7 @@
#include <cstring> // for memset #include <cstring> // for memset
#include <float.h> #include <float.h>
#ifndef _MSC_VER #ifdef _MSC_VER
#include <stdint.h> // For SET_UINT_IN_POINTER, i.e. uintptr_t. #include <stdint.h> // For SET_UINT_IN_POINTER, i.e. uintptr_t.
#endif #endif
#include <vector> #include <vector>

2
source/blender/imbuf/intern/util.c
View File

@ -252,7 +252,7 @@ static int isqtime(const char *name)
#ifdef WITH_FFMPEG #ifdef WITH_FFMPEG
#ifdef _MSC_VER #if defined(_MSC_VER) && _MSC_VER < 1800
#define va_copy(dst, src) ((dst) = (src)) #define va_copy(dst, src) ((dst) = (src))
#endif #endif