diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-12-27 12:53:02 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-12-27 12:53:02 +0300 |
| commit | 5216dd5fce49efbb7a86a795bbfea664108c65d4 (patch) | |
| tree | c13aa23a2397bcc895f807b4f9f2c9eea8524593 /source/blender/blenlib | |
| parent | 73c46431799c85e83401e20cdc5816b3c76c1fd1 (diff) | |
| parent | 2c0c1f494dcfadb3c01d23e2348e28bc8864e9f3 (diff) | |
Merge branch 'blender2.7'
Diffstat (limited to 'source/blender/blenlib')
| -rw-r--r-- | source/blender/blenlib/BLI_compiler_attrs.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/source/blender/blenlib/BLI_compiler_attrs.h b/source/blender/blenlib/BLI_compiler_attrs.h index 2b6baa0d67b..09c0426db92 100644 --- a/source/blender/blenlib/BLI_compiler_attrs.h +++ b/source/blender/blenlib/BLI_compiler_attrs.h @@ -93,10 +93,12 @@ #endif /* Use to suppress '-Wimplicit-fallthrough' (in place of 'break'). */ -#if defined(__GNUC__) && (__GNUC__ >= 7) /* gcc7.0+ only */ -# define ATTR_FALLTHROUGH __attribute__((fallthrough)) -#else -# define ATTR_FALLTHROUGH ((void)0) +#ifndef ATTR_FALLTHROUGH +# if defined(__GNUC__) && (__GNUC__ >= 7) /* gcc7.0+ only */ +# define ATTR_FALLTHROUGH __attribute__((fallthrough)) +# else +# define ATTR_FALLTHROUGH ((void)0) +# endif #endif /* Declare the memory alignment in Bytes. */ |