diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-02-26 21:24:04 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-02-26 21:24:04 +0400 |
| commit | 6bc7c30b9346e8a382de6a47cd4c14e6e134fc1d (patch) | |
| tree | 5ba93eb2d2e8d9d85310a566f2fbb9fbd770ad88 | |
| parent | 74e9563b8a76e509263390763b7328ce7c2ccff1 (diff) | |
fix for build error with non debug builds from last commit.
| -rw-r--r-- | source/blender/blenlib/BLI_utildefines.h | 8 | ||||
| -rw-r--r-- | source/blender/bmesh/bmesh_error.h | 14 |
2 files changed, 10 insertions, 12 deletions
diff --git a/source/blender/blenlib/BLI_utildefines.h b/source/blender/blenlib/BLI_utildefines.h index ef8a6015adb..d42e228ca11 100644 --- a/source/blender/blenlib/BLI_utildefines.h +++ b/source/blender/blenlib/BLI_utildefines.h @@ -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 diff --git a/source/blender/bmesh/bmesh_error.h b/source/blender/bmesh/bmesh_error.h index 79ca9f61b94..d130e18ac76 100644 --- a/source/blender/bmesh/bmesh_error.h +++ b/source/blender/bmesh/bmesh_error.h @@ -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__ */ |