forked from bartvdbraak/blender
code cleanup: header cleanup, remove commented workaround for mingw since its no longer needed.
This commit is contained in:
parent
110a1526b6
commit
df29e91a69
@ -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);
|
||||
|
@ -15,7 +15,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "math.h"
|
||||
#include <math.h>
|
||||
#include "plugin.h"
|
||||
#include <stdio.h>
|
||||
|
||||
|
@ -15,7 +15,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "math.h"
|
||||
#include <math.h>
|
||||
#include "plugin.h"
|
||||
#include <stdio.h>
|
||||
|
||||
|
@ -15,7 +15,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "math.h"
|
||||
#include <math.h>
|
||||
#include "plugin.h"
|
||||
#include <stdio.h>
|
||||
|
||||
|
@ -15,7 +15,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "math.h"
|
||||
#include <math.h>
|
||||
#include "plugin.h"
|
||||
#include "util.h"
|
||||
#include <stdio.h>
|
||||
|
@ -26,7 +26,7 @@
|
||||
* ***** END GPL LICENSE BLOCK *****
|
||||
*/
|
||||
|
||||
#include "math.h"
|
||||
#include <math.h>
|
||||
#include "plugin.h"
|
||||
|
||||
/* ******************** GLOBAL VARIABLES ***************** */
|
||||
|
@ -26,7 +26,7 @@
|
||||
* ***** END GPL LICENSE BLOCK *****
|
||||
*/
|
||||
|
||||
#include "math.h"
|
||||
#include <math.h>
|
||||
#include "plugin.h"
|
||||
|
||||
/* ******************** GLOBAL VARIABLES ***************** */
|
||||
|
@ -32,7 +32,7 @@
|
||||
|
||||
#include <string.h>
|
||||
#include <math.h>
|
||||
#include "ctype.h"
|
||||
#include <ctype.h>
|
||||
|
||||
#include "MEM_guardedalloc.h"
|
||||
|
||||
|
@ -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 */
|
||||
|
@ -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"
|
||||
|
||||
|
@ -28,20 +28,16 @@ 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 */
|
||||
#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)
|
||||
|
Loading…
Reference in New Issue
Block a user