diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-12-21 19:05:56 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-12-21 19:05:56 +0300 |
| commit | 275c627b5e642163fc4f02ac256383519ae39394 (patch) | |
| tree | 445f110146ec322f8cbf6fed16e3c6910b47779e /intern/cycles/util | |
| parent | 2ca4f4f0cb8d5d7e0b759fdc5b5a5b7adf7a5817 (diff) | |
| parent | 4eeab96f105f12cfbecc305c3f46475b6724470c (diff) | |
Merge branch 'blender2.7'
Diffstat (limited to 'intern/cycles/util')
| -rw-r--r-- | intern/cycles/util/util_defines.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/intern/cycles/util/util_defines.h b/intern/cycles/util/util_defines.h index 429cfe647ef..2cb42d9bd56 100644 --- a/intern/cycles/util/util_defines.h +++ b/intern/cycles/util/util_defines.h @@ -69,10 +69,12 @@ # endif /* _WIN32 && !FREE_WINDOWS */ /* 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 #endif /* __KERNEL_GPU__ */ |