[Bf-blender-cvs] [ae475e3] master: Fix release build after recent fix for debug one

Sergey Sharybin noreply at git.blender.org
Tue Aug 16 15:06:19 CEST 2016


Commit: ae475e355488db27c4b9fcc33385080578403833
Author: Sergey Sharybin
Date:   Tue Aug 16 14:57:56 2016 +0200
Branches: master
https://developer.blender.org/rBae475e355488db27c4b9fcc33385080578403833

Fix release build after recent fix for debug one

It's becoming annoying to have public API dependent on build type
and everything. Let's just always have API defined and do stubs
in the function implementation instead.

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

M	source/blender/blenlib/BLI_system.h
M	source/blender/blenlib/BLI_utildefines.h
M	source/blender/makesrna/intern/makesrna.c

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

diff --git a/source/blender/blenlib/BLI_system.h b/source/blender/blenlib/BLI_system.h
index 938a12d..f51b962 100644
--- a/source/blender/blenlib/BLI_system.h
+++ b/source/blender/blenlib/BLI_system.h
@@ -21,11 +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);
+void BLI_system_backtrace(FILE *fp);
 
 /* getpid */
 #ifdef WIN32
diff --git a/source/blender/blenlib/BLI_utildefines.h b/source/blender/blenlib/BLI_utildefines.h
index d504e50..746eb92 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/makesrna/intern/makesrna.c b/source/blender/makesrna/intern/makesrna.c
index 1f8ef0d..569c1ee 100644
--- a/source/blender/makesrna/intern/makesrna.c
+++ b/source/blender/makesrna/intern/makesrna.c
@@ -50,7 +50,7 @@
 #ifndef NDEBUG
 void BLI_system_backtrace(FILE *fp)
 {
-	(void)fp;
+       (void)fp;
 }
 #endif




More information about the Bf-blender-cvs mailing list