diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2017-11-10 12:13:19 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2017-11-10 12:13:19 +0300 |
commit | 7a6ad2901cce23d47c3a0618b4791d4eb034a6c5 (patch) | |
tree | abf9644577d5b7adcfb196ea74b81c5ee9e7e4d1 /source/blender/blenlib | |
parent | 7defb27f084288e0218f068aec74a693a0ca9b6a (diff) | |
parent | a466d7ae248b2807b4e2f8693b458d3da509e9bc (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenlib')
-rw-r--r-- | source/blender/blenlib/BLI_compiler_attrs.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/source/blender/blenlib/BLI_compiler_attrs.h b/source/blender/blenlib/BLI_compiler_attrs.h index 4c548654e33..2b6baa0d67b 100644 --- a/source/blender/blenlib/BLI_compiler_attrs.h +++ b/source/blender/blenlib/BLI_compiler_attrs.h @@ -94,10 +94,16 @@ /* Use to suppress '-Wimplicit-fallthrough' (in place of 'break'). */ #if defined(__GNUC__) && (__GNUC__ >= 7) /* gcc7.0+ only */ -#define ATTR_FALLTHROUGH __attribute__((fallthrough)) +# define ATTR_FALLTHROUGH __attribute__((fallthrough)) #else -#define ATTR_FALLTHROUGH ((void)0) +# define ATTR_FALLTHROUGH ((void)0) #endif +/* Declare the memory alignment in Bytes. */ +#if defined(_WIN32) && !defined(FREE_WINDOWS) +# define ATTR_ALIGN(x) __declspec(align(x)) +#else +# define ATTR_ALIGN(x) __attribute__((aligned(x))) +#endif #endif /* __BLI_COMPILER_ATTRS_H__ */ |