diff options
author | Campbell Barton <ideasman42@gmail.com> | 2014-08-02 12:03:50 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2014-08-02 12:08:44 +0400 |
commit | 88a0d5ebe821d3ccd2261e99e8a9d47cceed57dc (patch) | |
tree | da7f372f22771f1ab41f8e3a0a85d0f74d471650 /intern | |
parent | d98b6a289cc3769b1a8f4e5295533c029e4bd1fa (diff) |
Make CHECK_TYPE_NONCONST macro portable
also replace __typeof -> typeof
Diffstat (limited to 'intern')
-rw-r--r-- | intern/cycles/util/util_types.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/intern/cycles/util/util_types.h b/intern/cycles/util/util_types.h index 98d70786d44..d7d80e2cffd 100644 --- a/intern/cycles/util/util_types.h +++ b/intern/cycles/util/util_types.h @@ -474,14 +474,14 @@ enum InterpolationType { * ... the compiler optimizes away the temp var */ #ifdef __GNUC__ #define CHECK_TYPE(var, type) { \ - __typeof(var) *__tmp; \ + typeof(var) *__tmp; \ __tmp = (type *)NULL; \ (void)__tmp; \ } (void)0 #define CHECK_TYPE_PAIR(var_a, var_b) { \ - __typeof(var_a) *__tmp; \ - __tmp = (__typeof(var_b) *)NULL; \ + typeof(var_a) *__tmp; \ + __tmp = (typeof(var_b) *)NULL; \ (void)__tmp; \ } (void)0 #else |