diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-07-27 00:35:44 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-07-27 00:35:44 +0300 |
| commit | 11e95fcdd292f4f0c4dfcb05616c181aa9789fd9 (patch) | |
| tree | 833ad8118e1b3a9749c6df364d7faec49ae3ac4e /intern | |
| parent | 48e8a1a1670101a38db5aa10970c4aa938bc9451 (diff) | |
| parent | 5c963128ea2435375dbfcc0319e9d49df06881c5 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/atomic/intern/atomic_ops_utils.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/intern/atomic/intern/atomic_ops_utils.h b/intern/atomic/intern/atomic_ops_utils.h index bfec9918c16..fa8f39b4e81 100644 --- a/intern/atomic/intern/atomic_ops_utils.h +++ b/intern/atomic/intern/atomic_ops_utils.h @@ -63,12 +63,7 @@ #if defined(_MSC_VER) # define ATOMIC_INLINE static __forceinline #else -# if (defined(__APPLE__) && defined(__ppc__)) -/* static inline __attribute__ here breaks osx ppc gcc42 build */ -# define ATOMIC_INLINE static __attribute__((always_inline)) -# else -# define ATOMIC_INLINE static inline __attribute__((always_inline)) -# endif +# define ATOMIC_INLINE static inline __attribute__((always_inline)) #endif #ifndef LIKELY |