get rid of annoying redefinition warning on cycles compilation for mingw64

2012-12-02 20:08:11 +00:00
parent e8331327e5
commit 4e7a4960f7
1 changed files with 2 additions and 0 deletions
--- 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