diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-12-21 19:02:04 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-12-21 19:02:04 +0300 |
| commit | 4eeab96f105f12cfbecc305c3f46475b6724470c (patch) | |
| tree | 0658655560875c9098ead7c9039f243b28589c87 /intern | |
| parent | d6ca47a344a8382daf1fd7cdcaeb5b3bea541c0e (diff) | |
Cleanup: fix ATTR_FALLTHROUGH warnings.
Ref D3960.
Diffstat (limited to 'intern')
| -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__ */ |