Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2012-02-26 21:24:04 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-02-26 21:24:04 +0400
commit6bc7c30b9346e8a382de6a47cd4c14e6e134fc1d (patch)
tree5ba93eb2d2e8d9d85310a566f2fbb9fbd770ad88 /source/blender/blenlib
parent74e9563b8a76e509263390763b7328ce7c2ccff1 (diff)
fix for build error with non debug builds from last commit.
Diffstat (limited to 'source/blender/blenlib')
-rw-r--r--source/blender/blenlib/BLI_utildefines.h8
1 files changed, 4 insertions, 4 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