[Bf-blender-cvs] [abb7e9f] master: Attempt to fix compilation error on Debian armel kernel
Sergey Sharybin
noreply at git.blender.org
Thu Dec 12 12:33:47 CET 2013
Commit: abb7e9f09b9f01a2b3a7b062caa3ef449cc7fb44
Author: Sergey Sharybin
Date: Thu Dec 12 17:33:17 2013 +0600
http://developer.blender.org/rBabb7e9f09b9f01a2b3a7b062caa3ef449cc7fb44
Attempt to fix compilation error on Debian armel kernel
===================================================================
M intern/atomic/atomic_ops.h
===================================================================
diff --git a/intern/atomic/atomic_ops.h b/intern/atomic/atomic_ops.h
index 243e194..b5a73b1 100644
--- a/intern/atomic/atomic_ops.h
+++ b/intern/atomic/atomic_ops.h
@@ -35,10 +35,19 @@
# include <libkern/OSAtomic.h>
#elif defined(_MSC_VER)
# include <windows.h>
+#elif defined(__arm__)
+/* Attempt to fix compilation error on Debian armel kernel.
+ * arm7 architecture does have both 32 and 64bit atomics, however
+ * it's gcc doesn't have __GCC_HAVE_SYNC_COMPARE_AND_SWAP_n defined.
+ */
+# define JE_FORCE_SYNC_COMPARE_AND_SWAP_8
+# define JE_FORCE_SYNC_COMPARE_AND_SWAP_4
#endif
/* needed for int types */
#include "../../source/blender/blenlib/BLI_sys_types.h"
+#include <stdlib.h>
+#include <stddef.h>
/* little macro so inline keyword works */
#if defined(_MSC_VER)
More information about the Bf-blender-cvs
mailing list