[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52907] trunk/blender/intern/guardedalloc: improvement to previous commit.

[Campbell Barton]

Revision: 52907
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52907
Author:   campbellbarton
Date:     2012-12-12 04:50:53 +0000 (Wed, 12 Dec 2012)
Log Message:
-----------
improvement to previous commit.

Modified Paths:
--------------
    trunk/blender/intern/guardedalloc/CMakeLists.txt
    trunk/blender/intern/guardedalloc/SConscript
    trunk/blender/intern/guardedalloc/intern/mallocn.c

Modified: trunk/blender/intern/guardedalloc/CMakeLists.txt
===================================================================
--- trunk/blender/intern/guardedalloc/CMakeLists.txt	2012-12-12 04:41:23 UTC (rev 52906)
+++ trunk/blender/intern/guardedalloc/CMakeLists.txt	2012-12-12 04:50:53 UTC (rev 52907)
@@ -46,11 +46,6 @@
 	)
 endif()
 
-# only for debugging
-if(WITH_OPENMP)
-	add_definitions(-DPARALLEL=1)
-endif()
-
 blender_add_lib(bf_intern_guardedalloc "${SRC}" "${INC}" "${INC_SYS}")
 
 # Override C++ alloc, optional.

Modified: trunk/blender/intern/guardedalloc/SConscript
===================================================================
--- trunk/blender/intern/guardedalloc/SConscript	2012-12-12 04:41:23 UTC (rev 52906)
+++ trunk/blender/intern/guardedalloc/SConscript	2012-12-12 04:50:53 UTC (rev 52907)
@@ -12,9 +12,4 @@
 
 incs = '.'
 
-if env['WITH_BF_OPENMP']:
-    if env['OURPLATFORM'] == 'linuxcross':
-        incs += ' ' + env['BF_OPENMP_INC']
-    defs.append('PARALLEL=1')
-
 env.BlenderLib ('bf_intern_guardedalloc', sources, Split(incs), defs, libtype=['intern','player'], priority = [5,150] )

Modified: trunk/blender/intern/guardedalloc/intern/mallocn.c
===================================================================
--- trunk/blender/intern/guardedalloc/intern/mallocn.c	2012-12-12 04:41:23 UTC (rev 52906)
+++ trunk/blender/intern/guardedalloc/intern/mallocn.c	2012-12-12 04:50:53 UTC (rev 52907)
@@ -113,7 +113,7 @@
 /* for openmp threading asserts, saves time troubleshooting
  * we may need to extend this if blender code starts using MEM_
  * functions inside OpenMP correctly with omp_set_lock() */
-#if (PARALLEL == 1) && defined(DEBUG)
+#if defined(_OPENMP) && defined(DEBUG)
 #  include <assert.h>
 #  include <omp.h>
 #  define DEBUG_OMP_MALLOC