diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-11-14 21:18:47 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-11-14 21:18:47 +0400 |
| commit | 71389d4d74fd1e632ff0e23416d33ca5e63c609d (patch) | |
| tree | 06412866e89a439ce9944738bdc1d12fb8b38ad0 /intern | |
| parent | 8c6350f9262581fe405020449f6a8d06a2a9aaa0 (diff) | |
Cycles OSL: windows build fixes.
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/kernel/kernel_accumulate.h | 4 | ||||
| -rw-r--r-- | intern/cycles/util/util_thread.h | 6 |
2 files changed, 1 insertions, 9 deletions
diff --git a/intern/cycles/kernel/kernel_accumulate.h b/intern/cycles/kernel/kernel_accumulate.h index 2f2314c9a8b..d99beb8905a 100644 --- a/intern/cycles/kernel/kernel_accumulate.h +++ b/intern/cycles/kernel/kernel_accumulate.h @@ -301,10 +301,6 @@ __device_inline float3 path_radiance_sum(KernelGlobals *kg, PathRadiance *L) __device_inline void path_radiance_clamp(PathRadiance *L, float3 *L_sum, float clamp) { - #ifdef __OSL__ - using std::isfinite; - #endif - float sum = fabsf((*L_sum).x) + fabsf((*L_sum).y) + fabsf((*L_sum).z); if(!isfinite(sum)) { diff --git a/intern/cycles/util/util_thread.h b/intern/cycles/util/util_thread.h index 843764ca9d6..751d22b2f63 100644 --- a/intern/cycles/util/util_thread.h +++ b/intern/cycles/util/util_thread.h @@ -75,7 +75,7 @@ protected: * Boost implementation is a bit slow, and Mac OS X __thread is not supported * but the pthreads implementation is optimized, so we use these macros. */ -#ifdef __APPLE__ +#if defined(__APPLE__) || defined(_WIN32) #define tls_ptr(type, name) \ pthread_key_t name @@ -90,10 +90,6 @@ protected: #else -#ifdef __WIN32 -#define __thread __declspec(thread) -#endif - #define tls_ptr(type, name) \ __thread type *name #define tls_set(name, value) \ |