Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix for build error with non debug builds from last commit.

Browse Source
This commit is contained in:
Campbell Barton
2012-02-26 17:24:04 +00:00
parent 74e9563b8a
commit 6bc7c30b93
2 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/blenlib/BLI_utildefines.h
View File

@@ -277,9 +277,9 @@
*/
#if !defined NDEBUG
# ifdef WITH_ASSERT_ABORT
# define _dummy_abort abort
# define _BLI_DUMMY_ABORT abort
# else
# define _dummy_abort() (void)0
# define _BLI_DUMMY_ABORT() (void)0
# endif
# if defined(__GNUC__) || defined(_MSC_VER) /* check __func__ is available */
# define BLI_assert(a) \
@@ -288,7 +288,7 @@
fprintf(stderr, \
"BLI_assert failed: %s, %s(), %d at \'%s\'\n", \
__FILE__, __func__, __LINE__, STRINGIFY(a)), \
_dummy_abort(), \
_BLI_DUMMY_ABORT(), \
NULL)) : NULL)
# else
# define BLI_assert(a) \
@@ -297,7 +297,7 @@
fprintf(stderr, \
"BLI_assert failed: %s, %d at \'%s\'\n", \
__FILE__, __LINE__, STRINGIFY(a)), \
_dummy_abort(), \
_BLI_DUMMY_ABORT(), \
NULL)) : NULL)
# endif
#else

14
source/blender/bmesh/bmesh_error.h
View File

@@ -69,13 +69,11 @@ int BMO_error_catch_op(BMesh *bm, BMOperator *catchop, int errorcode, char **msg
#define BMERR_INVALID_SELECTION 9
#define BMERR_MESH_ERROR 10
/* BMESH_ERROR */
/* _dummy_abort's defuned */
#ifndef _dummy_abort
# error "BLI_utildefines.h not included, '_dummy_abort' missing !"
/* BMESH_ASSERT */
#ifdef WITH_ASSERT_ABORT
# define _BMESH_DUMMY_ABORT abort
#else
# define _BMESH_DUMMY_ABORT() (void)0
#endif
/* this is meant to be higher level then BLI_assert(),
@@ -86,7 +84,7 @@ int BMO_error_catch_op(BMesh *bm, BMOperator *catchop, int errorcode, char **msg
fprintf(stderr, \
"BMESH_ASSERT failed: %s, %s(), %d at \'%s\'\n", \
__FILE__, __func__, __LINE__, STRINGIFY(a)), \
_dummy_abort(), \
_BMESH_DUMMY_ABORT(), \
NULL)) : NULL)
#endif /* __BMESH_ERROR_H__ */