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

code cleanup: header cleanup, remove commented workaround for mingw since its no longer needed.

Browse Source
This commit is contained in:
Campbell Barton 2012-04-06 04:46:47 +00:00
parent 110a1526b6
commit df29e91a69
11 changed files with 16 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
intern/guardedalloc/intern/mallocn.c
View File

@ -319,7 +319,7 @@ void *MEM_mallocN(size_t len, const char *str)
#ifdef DEBUG_MEMCOUNTER #ifdef DEBUG_MEMCOUNTER
if(_mallocn_count==DEBUG_MEMCOUNTER_ERROR_VAL) if(_mallocn_count==DEBUG_MEMCOUNTER_ERROR_VAL)
memcount_raise("MEM_mallocN"); memcount_raise(__func__);
memh->_count= _mallocn_count++; memh->_count= _mallocn_count++;
#endif #endif
return (++memh); return (++memh);
@ -344,7 +344,7 @@ void *MEM_callocN(size_t len, const char *str)
mem_unlock_thread(); mem_unlock_thread();
#ifdef DEBUG_MEMCOUNTER #ifdef DEBUG_MEMCOUNTER
if(_mallocn_count==DEBUG_MEMCOUNTER_ERROR_VAL) if(_mallocn_count==DEBUG_MEMCOUNTER_ERROR_VAL)
memcount_raise("MEM_callocN"); memcount_raise(__func__);
memh->_count= _mallocn_count++; memh->_count= _mallocn_count++;
#endif #endif
return (++memh); return (++memh);
@ -374,7 +374,7 @@ void *MEM_mapallocN(size_t len, const char *str)
mem_unlock_thread(); mem_unlock_thread();
#ifdef DEBUG_MEMCOUNTER #ifdef DEBUG_MEMCOUNTER
if(_mallocn_count==DEBUG_MEMCOUNTER_ERROR_VAL) if(_mallocn_count==DEBUG_MEMCOUNTER_ERROR_VAL)
memcount_raise("MEM_mapallocN"); memcount_raise(__func__);
memh->_count= _mallocn_count++; memh->_count= _mallocn_count++;
#endif #endif
return (++memh); return (++memh);

2
release/plugins/sequence/color-correction-hsv.c
View File

@ -15,7 +15,7 @@
* *
*/ */
#include "math.h" #include <math.h>
#include "plugin.h" #include "plugin.h"
#include <stdio.h> #include <stdio.h>

2
release/plugins/sequence/color-correction-yuv.c
View File

@ -15,7 +15,7 @@
* *
*/ */
#include "math.h" #include <math.h>
#include "plugin.h" #include "plugin.h"
#include <stdio.h> #include <stdio.h>

2
release/plugins/sequence/dnr.c
View File

@ -15,7 +15,7 @@
* *
*/ */
#include "math.h" #include <math.h>
#include "plugin.h" #include "plugin.h"
#include <stdio.h> #include <stdio.h>

2
release/plugins/sequence/gamma.c
View File

@ -15,7 +15,7 @@
* *
*/ */
#include "math.h" #include <math.h>
#include "plugin.h" #include "plugin.h"
#include "util.h" #include "util.h"
#include <stdio.h> #include <stdio.h>

2
release/plugins/texture/clouds2.c
View File

@ -26,7 +26,7 @@
* ***** END GPL LICENSE BLOCK ***** * ***** END GPL LICENSE BLOCK *****
*/ */
#include "math.h" #include <math.h>
#include "plugin.h" #include "plugin.h"
/* ******************** GLOBAL VARIABLES ***************** */ /* ******************** GLOBAL VARIABLES ***************** */

2
release/plugins/texture/tiles.c
View File

@ -26,7 +26,7 @@
* ***** END GPL LICENSE BLOCK ***** * ***** END GPL LICENSE BLOCK *****
*/ */
#include "math.h" #include <math.h>
#include "plugin.h" #include "plugin.h"
/* ******************** GLOBAL VARIABLES ***************** */ /* ******************** GLOBAL VARIABLES ***************** */

2
source/blender/blenkernel/intern/deform.c
View File

@ -32,7 +32,7 @@
#include <string.h> #include <string.h>
#include <math.h> #include <math.h>
#include "ctype.h" #include <ctype.h>
#include "MEM_guardedalloc.h" #include "MEM_guardedalloc.h"

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

@ -46,7 +46,7 @@
#include "IMB_imbuf_types.h" #include "IMB_imbuf_types.h"
#include "IMB_imbuf.h" #include "IMB_imbuf.h"
#include "math.h" #include <math.h>
/* This define should be relocated to a global header some where Kent Mein /* This define should be relocated to a global header some where Kent Mein
* I stole it from util.h in the plugins api */ * I stole it from util.h in the plugins api */

3
source/blender/render/intern/source/sunsky.c
View File

@ -26,10 +26,7 @@
* http://www.cs.utah.edu/vissim/papers/sunsky/code/ * http://www.cs.utah.edu/vissim/papers/sunsky/code/
*/ */
#include "sunsky.h" #include "sunsky.h"
#include "math.h"
#include "BLI_math.h" #include "BLI_math.h"
#include "BKE_global.h" #include "BKE_global.h"

14
source/gameengine/VideoTexture/VideoFFmpeg.h
View File

@ -28,30 +28,26 @@ http://www.gnu.org/copyleft/lesser.txt.
#define __VIDEOFFMPEG_H__ #define __VIDEOFFMPEG_H__
#ifdef WITH_FFMPEG #ifdef WITH_FFMPEG
#if defined(__FreeBSD__)
/* this needs to be parsed with __cplusplus defined before included through ffmpeg_compat.h */ /* this needs to be parsed with __cplusplus defined before included through ffmpeg_compat.h */
#include <inttypes.h> #if defined(__FreeBSD__)
# include <inttypes.h>
#endif #endif
extern "C" { extern "C" {
// #undef __cplusplus // was done for mingw4.4, see r23608
#include <pthread.h> #include <pthread.h>
#include "ffmpeg_compat.h" #include "ffmpeg_compat.h"
#include "DNA_listBase.h" #include "DNA_listBase.h"
#include "BLI_threads.h" #include "BLI_threads.h"
#include "BLI_blenlib.h" #include "BLI_blenlib.h"
// #define __cplusplus
} }
#if LIBAVFORMAT_VERSION_INT < (49 << 16) #if LIBAVFORMAT_VERSION_INT < (49 << 16)
#define FFMPEG_OLD_FRAME_RATE 1 # define FFMPEG_OLD_FRAME_RATE 1
#else #else
#define FFMPEG_CODEC_IS_POINTER 1 # define FFMPEG_CODEC_IS_POINTER 1
#endif #endif
#if LIBAVFORMAT_VERSION_INT >= (52 << 16) #if LIBAVFORMAT_VERSION_INT >= (52 << 16)
#define FFMPEG_PB_IS_POINTER 1 # define FFMPEG_PB_IS_POINTER 1
#endif #endif
#ifdef FFMPEG_CODEC_IS_POINTER #ifdef FFMPEG_CODEC_IS_POINTER