diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-08-28 12:27:50 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-08-28 12:27:50 +0300 |
| commit | f9f4e208713ec2b4fa8f8e112fb50cfd1ee6a266 (patch) | |
| tree | d20c41753ed01f847e3baab635d20fdfd058e0a3 /intern | |
| parent | 49e7b77b1952c6ea4ab5064d0d31b54052301ffd (diff) | |
| parent | 2e71927622ec7e25c400f23b58fd8d14e056482d (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/atomic/intern/atomic_ops_utils.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/atomic/intern/atomic_ops_utils.h b/intern/atomic/intern/atomic_ops_utils.h index fa8f39b4e81..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> |