[Bf-blender-cvs] [a74dab8] master: Fix redundant declarations after recent changes in GPU debug

[Sergey Sharybin]

Commit: a74dab86ee3bad8cefff8d0fa3b7ab54c8e2158f
Author: Sergey Sharybin
Date:   Tue Aug 16 14:40:23 2016 +0200
Branches: master
https://developer.blender.org/rBa74dab86ee3bad8cefff8d0fa3b7ab54c8e2158f

Fix redundant declarations after recent changes in GPU debug

===================================================================

M	source/blender/blenlib/BLI_system.h
M	source/blender/blenlib/intern/system.c
M	source/blender/gpu/GPU_debug.h
M	source/blender/gpu/intern/gpu_debug.c

===================================================================

diff --git a/source/blender/blenlib/BLI_system.h b/source/blender/blenlib/BLI_system.h
index 92403eb..938a12d 100644
--- a/source/blender/blenlib/BLI_system.h
+++ b/source/blender/blenlib/BLI_system.h
@@ -27,11 +27,6 @@
 
 int BLI_cpu_support_sse2(void);
 
-#if defined(NDEBUG) || !defined(__BLI_UTILDEFINES_H__)
-#include <stdio.h>
-void BLI_system_backtrace(FILE *fp);
-#endif
-
 /* getpid */
 #ifdef WIN32
 #  define BLI_SYSTEM_PID_H <process.h>
diff --git a/source/blender/blenlib/intern/system.c b/source/blender/blenlib/intern/system.c
index 5d1bdd6..898075e 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 ec0db43..61b2bc5 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 5ed5124..d632e76 100644
--- a/source/blender/gpu/intern/gpu_debug.c
+++ b/source/blender/gpu/intern/gpu_debug.c
@@ -29,6 +29,7 @@
  *  \ingroup gpu
  */
 
+#include "BLI_utildefines.h"
 #include "BLI_sys_types.h"
 #include "BLI_system.h"