From df29e91a697fbc89dea9c38282f3283e2fee7cc5 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 6 Apr 2012 04:46:47 +0000 Subject: code cleanup: header cleanup, remove commented workaround for mingw since its no longer needed. --- intern/guardedalloc/intern/mallocn.c | 6 +++--- release/plugins/sequence/color-correction-hsv.c | 2 +- release/plugins/sequence/color-correction-yuv.c | 2 +- release/plugins/sequence/dnr.c | 2 +- release/plugins/sequence/gamma.c | 2 +- release/plugins/texture/clouds2.c | 2 +- release/plugins/texture/tiles.c | 2 +- source/blender/blenkernel/intern/deform.c | 2 +- source/blender/imbuf/intern/imageprocess.c | 2 +- source/blender/render/intern/source/sunsky.c | 3 --- source/gameengine/VideoTexture/VideoFFmpeg.h | 14 +++++--------- 11 files changed, 16 insertions(+), 23 deletions(-) diff --git a/intern/guardedalloc/intern/mallocn.c b/intern/guardedalloc/intern/mallocn.c index 97ac3008072..2a6a0df0ff4 100644 --- a/intern/guardedalloc/intern/mallocn.c +++ b/intern/guardedalloc/intern/mallocn.c @@ -319,7 +319,7 @@ void *MEM_mallocN(size_t len, const char *str) #ifdef DEBUG_MEMCOUNTER if(_mallocn_count==DEBUG_MEMCOUNTER_ERROR_VAL) - memcount_raise("MEM_mallocN"); + memcount_raise(__func__); memh->_count= _mallocn_count++; #endif return (++memh); @@ -344,7 +344,7 @@ void *MEM_callocN(size_t len, const char *str) mem_unlock_thread(); #ifdef DEBUG_MEMCOUNTER if(_mallocn_count==DEBUG_MEMCOUNTER_ERROR_VAL) - memcount_raise("MEM_callocN"); + memcount_raise(__func__); memh->_count= _mallocn_count++; #endif return (++memh); @@ -374,7 +374,7 @@ void *MEM_mapallocN(size_t len, const char *str) mem_unlock_thread(); #ifdef DEBUG_MEMCOUNTER if(_mallocn_count==DEBUG_MEMCOUNTER_ERROR_VAL) - memcount_raise("MEM_mapallocN"); + memcount_raise(__func__); memh->_count= _mallocn_count++; #endif return (++memh); diff --git a/release/plugins/sequence/color-correction-hsv.c b/release/plugins/sequence/color-correction-hsv.c index 1dcf0096efa..b9ffd88b26c 100644 --- a/release/plugins/sequence/color-correction-hsv.c +++ b/release/plugins/sequence/color-correction-hsv.c @@ -15,7 +15,7 @@ * */ -#include "math.h" +#include #include "plugin.h" #include diff --git a/release/plugins/sequence/color-correction-yuv.c b/release/plugins/sequence/color-correction-yuv.c index cc6c6198431..c0c5d048b8f 100644 --- a/release/plugins/sequence/color-correction-yuv.c +++ b/release/plugins/sequence/color-correction-yuv.c @@ -15,7 +15,7 @@ * */ -#include "math.h" +#include #include "plugin.h" #include diff --git a/release/plugins/sequence/dnr.c b/release/plugins/sequence/dnr.c index ab47361ea73..9c42098c248 100644 --- a/release/plugins/sequence/dnr.c +++ b/release/plugins/sequence/dnr.c @@ -15,7 +15,7 @@ * */ -#include "math.h" +#include #include "plugin.h" #include diff --git a/release/plugins/sequence/gamma.c b/release/plugins/sequence/gamma.c index 596c98646f3..d6181eb0e9d 100644 --- a/release/plugins/sequence/gamma.c +++ b/release/plugins/sequence/gamma.c @@ -15,7 +15,7 @@ * */ -#include "math.h" +#include #include "plugin.h" #include "util.h" #include diff --git a/release/plugins/texture/clouds2.c b/release/plugins/texture/clouds2.c index 454e8e28206..fc20f5769ef 100644 --- a/release/plugins/texture/clouds2.c +++ b/release/plugins/texture/clouds2.c @@ -26,7 +26,7 @@ * ***** END GPL LICENSE BLOCK ***** */ -#include "math.h" +#include #include "plugin.h" /* ******************** GLOBAL VARIABLES ***************** */ diff --git a/release/plugins/texture/tiles.c b/release/plugins/texture/tiles.c index c7af6e58fa4..151f64b6dab 100644 --- a/release/plugins/texture/tiles.c +++ b/release/plugins/texture/tiles.c @@ -26,7 +26,7 @@ * ***** END GPL LICENSE BLOCK ***** */ -#include "math.h" +#include #include "plugin.h" /* ******************** GLOBAL VARIABLES ***************** */ 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 #include -#include "ctype.h" +#include #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 /* 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 +#if defined(__FreeBSD__) +# include #endif extern "C" { -// #undef __cplusplus // was done for mingw4.4, see r23608 #include - #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 -- cgit v1.2.3