From b7a59f52b8918ffd40aeaecdc93224a8a7863d2f Mon Sep 17 00:00:00 2001 From: Joshua Leung Date: Sun, 29 Apr 2012 13:00:00 +0000 Subject: mingw32 compiles again "__force_inline" keyword used in Cycles header is not defined --- intern/cycles/util/util_types.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'intern/cycles/util') diff --git a/intern/cycles/util/util_types.h b/intern/cycles/util/util_types.h index cf167707e47..0451d877c45 100644 --- a/intern/cycles/util/util_types.h +++ b/intern/cycles/util/util_types.h @@ -36,7 +36,7 @@ #define __shared #define __constant -#ifdef _WIN32 +#if defined(_WIN32) && !defined(FREE_WINDOWS) #define __device_inline static __forceinline #define __align(...) __declspec(align(__VA_ARGS__)) #else -- cgit v1.2.3