diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2017-10-16 12:16:13 +0300 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2017-10-16 12:22:35 +0300 |
| commit | a78b3ee53aa53020b086a6df25c0e28491223dcc (patch) | |
| tree | bd883e95580f5777f7eae7cac4e47f182ac9fc00 /intern/atomic/intern/atomic_ops_utils.h | |
| parent | 4842cc017c3bb7df2070c2f96605190ff88e6a2e (diff) | |
| parent | 49f4ac17bf704614de59a4db7a65c205c085d694 (diff) | |
Merge remote-tracking branch 'origin/master' into openvdbopenvdb
Diffstat (limited to 'intern/atomic/intern/atomic_ops_utils.h')
| -rw-r--r-- | intern/atomic/intern/atomic_ops_utils.h | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/intern/atomic/intern/atomic_ops_utils.h b/intern/atomic/intern/atomic_ops_utils.h index bfec9918c16..c190b655e0a 100644 --- a/intern/atomic/intern/atomic_ops_utils.h +++ b/intern/atomic/intern/atomic_ops_utils.h @@ -52,8 +52,8 @@ #ifndef __ATOMIC_OPS_UTILS_H__ #define __ATOMIC_OPS_UTILS_H__ -/* needed for int types */ -#include "../../../source/blender/blenlib/BLI_sys_types.h" +#include <stdint.h> +#include <stddef.h> #include <stdlib.h> #include <limits.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 |