From a74dab86ee3bad8cefff8d0fa3b7ab54c8e2158f Mon Sep 17 00:00:00 2001
From: Sergey Sharybin <sergey.vfx@gmail.com>
Date: Tue, 16 Aug 2016 14:40:23 +0200
Subject: Fix redundant declarations after recent changes in GPU debug

---
 source/blender/blenlib/BLI_system.h    | 5 -----
 source/blender/blenlib/intern/system.c | 1 +
 source/blender/gpu/GPU_debug.h         | 2 --
 source/blender/gpu/intern/gpu_debug.c  | 1 +
 4 files changed, 2 insertions(+), 7 deletions(-)

(limited to 'source')

diff --git a/source/blender/blenlib/BLI_system.h b/source/blender/blenlib/BLI_system.h
index 92403eb7dea..938a12dcdcf 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 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 5ed51247858..d632e767ca9 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"
 
-- 
cgit v1.2.3