[Bf-blender-cvs] [ad4a01e] master: Fix OpenGL backtrace build errors, without disabling warnings.

Brecht Van Lommel noreply at git.blender.org
Mon Aug 15 15:51:34 CEST 2016


Commit: ad4a01ec0fa72ab4626922e9d5d3dda1a46ca01b
Author: Brecht Van Lommel
Date:   Mon Aug 15 15:34:41 2016 +0200
Branches: master
https://developer.blender.org/rBad4a01ec0fa72ab4626922e9d5d3dda1a46ca01b

Fix OpenGL backtrace build errors, without disabling warnings.

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

M	source/blender/blenlib/BLI_system.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 cb8cb6f..92403eb 100644
--- a/source/blender/blenlib/BLI_system.h
+++ b/source/blender/blenlib/BLI_system.h
@@ -28,6 +28,7 @@
 int BLI_cpu_support_sse2(void);
 
 #if defined(NDEBUG) || !defined(__BLI_UTILDEFINES_H__)
+#include <stdio.h>
 void BLI_system_backtrace(FILE *fp);
 #endif
 
diff --git a/source/blender/gpu/intern/gpu_debug.c b/source/blender/gpu/intern/gpu_debug.c
index 8d1ab43..af69c2f 100644
--- a/source/blender/gpu/intern/gpu_debug.c
+++ b/source/blender/gpu/intern/gpu_debug.c
@@ -30,6 +30,7 @@
  */
 
 #include "BLI_sys_types.h"
+#include "BLI_system.h"
 
 #include "BKE_global.h"
 
@@ -43,10 +44,6 @@
 
 #define CASE_CODE_RETURN_STR(code) case code: return #code;
 
-#if (defined(__GNUC__) && !defined(__clang__)) && defined(NDEBUG)
-#  pragma GCC diagnostic ignored "-Wimplicit-function-declaration"
-#endif
-
 static const char *gpu_gl_error_symbol(GLenum err)
 {
 	switch (err) {




More information about the Bf-blender-cvs mailing list