diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-04-06 08:46:47 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-04-06 08:46:47 +0400 |
commit | df29e91a697fbc89dea9c38282f3283e2fee7cc5 (patch) | |
tree | 949a95862aecbb4fbe8e93e7428687cde42c50c8 /source | |
parent | 110a1526b62aa738ac0639ba51d93e2e7611751d (diff) |
code cleanup: header cleanup, remove commented workaround for mingw since its no longer needed.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/blenkernel/intern/deform.c | 2 | ||||
-rw-r--r-- | source/blender/imbuf/intern/imageprocess.c | 2 | ||||
-rw-r--r-- | source/blender/render/intern/source/sunsky.c | 3 | ||||
-rw-r--r-- | source/gameengine/VideoTexture/VideoFFmpeg.h | 14 |
4 files changed, 7 insertions, 14 deletions
diff --git a/source/blender/blenkernel/intern/deform.c b/source/blender/blenkernel/intern/deform.c index c41f5b6f86f..1232177fa10 100644 --- a/source/blender/blenkernel/intern/deform.c +++ b/source/blender/blenkernel/intern/deform.c @@ -32,7 +32,7 @@ #include <string.h> #include <math.h> -#include "ctype.h" +#include <ctype.h> #include "MEM_guardedalloc.h" diff --git a/source/blender/imbuf/intern/imageprocess.c b/source/blender/imbuf/intern/imageprocess.c index 1976242ea4f..ba165d51e96 100644 --- a/source/blender/imbuf/intern/imageprocess.c +++ b/source/blender/imbuf/intern/imageprocess.c @@ -46,7 +46,7 @@ #include "IMB_imbuf_types.h" #include "IMB_imbuf.h" -#include "math.h" +#include <math.h> /* This define should be relocated to a global header some where Kent Mein * I stole it from util.h in the plugins api */ diff --git a/source/blender/render/intern/source/sunsky.c b/source/blender/render/intern/source/sunsky.c index 00370fb51bf..8097628e575 100644 --- a/source/blender/render/intern/source/sunsky.c +++ b/source/blender/render/intern/source/sunsky.c @@ -26,10 +26,7 @@ * http://www.cs.utah.edu/vissim/papers/sunsky/code/ */ - - #include "sunsky.h" -#include "math.h" #include "BLI_math.h" #include "BKE_global.h" diff --git a/source/gameengine/VideoTexture/VideoFFmpeg.h b/source/gameengine/VideoTexture/VideoFFmpeg.h index ee4354e256e..d3458211949 100644 --- a/source/gameengine/VideoTexture/VideoFFmpeg.h +++ b/source/gameengine/VideoTexture/VideoFFmpeg.h @@ -28,30 +28,26 @@ http://www.gnu.org/copyleft/lesser.txt. #define __VIDEOFFMPEG_H__ #ifdef WITH_FFMPEG -#if defined(__FreeBSD__) /* this needs to be parsed with __cplusplus defined before included through ffmpeg_compat.h */ -#include <inttypes.h> +#if defined(__FreeBSD__) +# include <inttypes.h> #endif extern "C" { -// #undef __cplusplus // was done for mingw4.4, see r23608 #include <pthread.h> - #include "ffmpeg_compat.h" - #include "DNA_listBase.h" #include "BLI_threads.h" #include "BLI_blenlib.h" -// #define __cplusplus } #if LIBAVFORMAT_VERSION_INT < (49 << 16) -#define FFMPEG_OLD_FRAME_RATE 1 +# define FFMPEG_OLD_FRAME_RATE 1 #else -#define FFMPEG_CODEC_IS_POINTER 1 +# define FFMPEG_CODEC_IS_POINTER 1 #endif #if LIBAVFORMAT_VERSION_INT >= (52 << 16) -#define FFMPEG_PB_IS_POINTER 1 +# define FFMPEG_PB_IS_POINTER 1 #endif #ifdef FFMPEG_CODEC_IS_POINTER |