diff options
author | Mike Erwin <significant.bit@gmail.com> | 2016-08-17 00:14:42 +0300 |
---|---|---|
committer | Mike Erwin <significant.bit@gmail.com> | 2016-08-17 00:14:42 +0300 |
commit | b92d76000d93758309c35c09f3a06c6103cc8bd0 (patch) | |
tree | 766f91e493c273ec74f9651343673084ec77e357 /source/blender | |
parent | b8f27b25145b23ebaa402aa6873ebfcbadc3491f (diff) |
fix #includes for GPU debug
Can now build release and debug.
Close to final version in master (which took several commits).
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/blenlib/BLI_system.h | 5 | ||||
-rw-r--r-- | source/blender/blenlib/BLI_utildefines.h | 2 | ||||
-rw-r--r-- | source/blender/blenlib/intern/system.c | 1 | ||||
-rw-r--r-- | source/blender/gpu/GPU_debug.h | 2 | ||||
-rw-r--r-- | source/blender/gpu/intern/gpu_debug.c | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/blenlib/BLI_system.h b/source/blender/blenlib/BLI_system.h index cb8cb6f5a0d..f51b9623803 100644 --- a/source/blender/blenlib/BLI_system.h +++ b/source/blender/blenlib/BLI_system.h @@ -21,15 +21,14 @@ #ifndef __BLI_SYSTEM_H__ #define __BLI_SYSTEM_H__ +#include <stdio.h> + /** \file BLI_system.h * \ingroup bli */ int BLI_cpu_support_sse2(void); - -#if defined(NDEBUG) || !defined(__BLI_UTILDEFINES_H__) void BLI_system_backtrace(FILE *fp); -#endif /* getpid */ #ifdef WIN32 diff --git a/source/blender/blenlib/BLI_utildefines.h b/source/blender/blenlib/BLI_utildefines.h index d504e503c68..746eb922c65 100644 --- a/source/blender/blenlib/BLI_utildefines.h +++ b/source/blender/blenlib/BLI_utildefines.h @@ -633,7 +633,7 @@ extern bool BLI_memory_is_zero(const void *arr, const size_t arr_size); * for aborting need to define WITH_ASSERT_ABORT */ #ifndef NDEBUG -extern void BLI_system_backtrace(FILE *fp); +# include "BLI_system.h" # ifdef WITH_ASSERT_ABORT # define _BLI_DUMMY_ABORT abort # else diff --git a/source/blender/blenlib/intern/system.c b/source/blender/blenlib/intern/system.c index 5d1bdd6d978..898075e651e 100644 --- a/source/blender/blenlib/intern/system.c +++ b/source/blender/blenlib/intern/system.c @@ -25,6 +25,7 @@ #include <stdio.h> #include <stdlib.h> +#include "BLI_utildefines.h" #include "BLI_system.h" #include "MEM_guardedalloc.h" diff --git a/source/blender/gpu/GPU_debug.h b/source/blender/gpu/GPU_debug.h index ec0db43c38c..61b2bc591ce 100644 --- a/source/blender/gpu/GPU_debug.h +++ b/source/blender/gpu/GPU_debug.h @@ -34,8 +34,6 @@ #include "GPU_glew.h" -#include "BLI_utildefines.h" - #ifdef __cplusplus extern "C" { #endif diff --git a/source/blender/gpu/intern/gpu_debug.c b/source/blender/gpu/intern/gpu_debug.c index 21458a22221..614fdeb6e85 100644 --- a/source/blender/gpu/intern/gpu_debug.c +++ b/source/blender/gpu/intern/gpu_debug.c @@ -29,7 +29,9 @@ * \ingroup gpu */ +#include "BLI_utildefines.h" #include "BLI_sys_types.h" +#include "BLI_system.h" #include "BKE_global.h" |