diff options
| author | Joshua Leung <aligorith@gmail.com> | 2012-04-29 17:00:00 +0400 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2012-04-29 17:00:00 +0400 |
| commit | b7a59f52b8918ffd40aeaecdc93224a8a7863d2f (patch) | |
| tree | 624497cd3e53f7ab327070b6437f4928d4e97cd1 /intern/cycles/util | |
| parent | 04d8ef3c476bf75d7790741b559cb4b6e075917b (diff) | |
mingw32 compiles again
"__force_inline" keyword used in Cycles header is not defined
Diffstat (limited to 'intern/cycles/util')
| -rw-r--r-- | intern/cycles/util/util_types.h | 2 |
1 files changed, 1 insertions, 1 deletions
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 |