[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44468] trunk/blender/source/blender: fix for build error with non debug builds from last commit.

[Campbell Barton]

Revision: 44468
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44468
Author:   campbellbarton
Date:     2012-02-26 17:24:04 +0000 (Sun, 26 Feb 2012)
Log Message:
-----------
fix for build error with non debug builds from last commit.

Modified Paths:
--------------
    trunk/blender/source/blender/blenlib/BLI_utildefines.h
    trunk/blender/source/blender/bmesh/bmesh_error.h

Modified: trunk/blender/source/blender/blenlib/BLI_utildefines.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_utildefines.h      2012-02-26 
17:20:36 UTC (rev 44467)
+++ trunk/blender/source/blender/blenlib/BLI_utildefines.h      2012-02-26 
17:24:04 UTC (rev 44468)
@@ -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

Modified: trunk/blender/source/blender/bmesh/bmesh_error.h
===================================================================
--- trunk/blender/source/blender/bmesh/bmesh_error.h    2012-02-26 17:20:36 UTC 
(rev 44467)
+++ trunk/blender/source/blender/bmesh/bmesh_error.h    2012-02-26 17:24:04 UTC 
(rev 44468)
@@ -69,13 +69,11 @@
 #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 @@
                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__ */

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs