[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59166] branches/soc-2013-depsgraph_mt/ intern/guardedalloc/intern/mallocn.c: Atomic ops are only used in guarded allocator, so move include into ifdef
Sergey Sharybin
sergey.vfx at gmail.com
Thu Aug 15 14:28:30 CEST 2013
Revision: 59166
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59166
Author: nazgul
Date: 2013-08-15 12:28:30 +0000 (Thu, 15 Aug 2013)
Log Message:
-----------
Atomic ops are only used in guarded allocator, so move include into ifdef
Modified Paths:
--------------
branches/soc-2013-depsgraph_mt/intern/guardedalloc/intern/mallocn.c
Modified: branches/soc-2013-depsgraph_mt/intern/guardedalloc/intern/mallocn.c
===================================================================
--- branches/soc-2013-depsgraph_mt/intern/guardedalloc/intern/mallocn.c 2013-08-15 12:22:44 UTC (rev 59165)
+++ branches/soc-2013-depsgraph_mt/intern/guardedalloc/intern/mallocn.c 2013-08-15 12:28:30 UTC (rev 59166)
@@ -50,11 +50,11 @@
#include "MEM_guardedalloc.h"
-#include "atomic_ops.h"
-
/* should always be defined except for experimental cases */
#ifdef WITH_GUARDEDALLOC
+#include "atomic_ops.h"
+
/* Blame Microsoft for LLP64 and no inttypes.h, quick workaround needed: */
#if defined(WIN64)
# define SIZET_FORMAT "%I64u"
More information about the Bf-blender-cvs
mailing list