[Bf-blender-cvs] [43238861233] master: Atomics: Cleanup, move defines closer to usage

[Sergey Sharybin]

Commit: 432388612336bd7b40d4c65ea06f676c0bbb78dc
Author: Sergey Sharybin
Date:   Wed Nov 25 12:37:20 2020 +0100
Branches: master
https://developer.blender.org/rB432388612336bd7b40d4c65ea06f676c0bbb78dc

Atomics: Cleanup, move defines closer to usage

There is a special defines block needed for ARM on Linux. Move it from
public header to an implementation file.

No functional changes.

This is a non-functional part of original fix done by Brecht in D9577.

===================================================================

M	intern/atomic/atomic_ops.h
M	intern/atomic/intern/atomic_ops_unix.h

===================================================================

diff --git a/intern/atomic/atomic_ops.h b/intern/atomic/atomic_ops.h
index 5e89315ebdc..91c6ab9fec5 100644
--- a/intern/atomic/atomic_ops.h
+++ b/intern/atomic/atomic_ops.h
@@ -54,16 +54,6 @@
 #ifndef __ATOMIC_OPS_H__
 #define __ATOMIC_OPS_H__
 
-#if defined(__arm__)
-/* Attempt to fix compilation error on Debian armel kernel.
- * arm7 architecture does have both 32 and 64bit atomics, however
- * its gcc doesn't have __GCC_HAVE_SYNC_COMPARE_AND_SWAP_n defined.
- */
-#  define JE_FORCE_SYNC_COMPARE_AND_SWAP_1
-#  define JE_FORCE_SYNC_COMPARE_AND_SWAP_4
-#  define JE_FORCE_SYNC_COMPARE_AND_SWAP_8
-#endif
-
 #include "intern/atomic_ops_utils.h"
 
 /******************************************************************************/
diff --git a/intern/atomic/intern/atomic_ops_unix.h b/intern/atomic/intern/atomic_ops_unix.h
index e1126cab0c2..3b1b5c072e8 100644
--- a/intern/atomic/intern/atomic_ops_unix.h
+++ b/intern/atomic/intern/atomic_ops_unix.h
@@ -49,6 +49,16 @@
 
 #include "atomic_ops_utils.h"
 
+#if defined(__arm__)
+/* Attempt to fix compilation error on Debian armel kernel.
+ * arm7 architecture does have both 32 and 64bit atomics, however
+ * its gcc doesn't have __GCC_HAVE_SYNC_COMPARE_AND_SWAP_n defined.
+ */
+#  define JE_FORCE_SYNC_COMPARE_AND_SWAP_1
+#  define JE_FORCE_SYNC_COMPARE_AND_SWAP_4
+#  define JE_FORCE_SYNC_COMPARE_AND_SWAP_8
+#endif
+
 /******************************************************************************/
 /* 64-bit operations. */
 #if (LG_SIZEOF_PTR == 8 || LG_SIZEOF_INT == 8)