diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2012-12-03 00:08:11 +0400 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2012-12-03 00:08:11 +0400 |
| commit | 4e7a4960f701ffef5665872e0e6ace6bb25e68a9 (patch) | |
| tree | 0cf9d56910611ea180d03774309825a4d1557b43 /intern/cycles/util/util_types.h | |
| parent | e8331327e51cda1d853e7111e9da2df45193e948 (diff) | |
get rid of annoying redefinition warning on cycles compilation for mingw64
Diffstat (limited to 'intern/cycles/util/util_types.h')
| -rw-r--r-- | intern/cycles/util/util_types.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/intern/cycles/util/util_types.h b/intern/cycles/util/util_types.h index fe530d727ad..3d246104ddc 100644 --- a/intern/cycles/util/util_types.h +++ b/intern/cycles/util/util_types.h @@ -41,7 +41,9 @@ #define __align(...) __declspec(align(__VA_ARGS__)) #else #define __device_inline static inline __attribute__((always_inline)) +#ifndef FREE_WINDOWS64 #define __forceinline inline __attribute__((always_inline)) +#endif #define __align(...) __attribute__((aligned(__VA_ARGS__))) #endif |