[Bf-blender-cvs] [35812e6] master: Cycles: Fix compilation error on windows after recent logging changes

[Sergey Sharybin]

Commit: 35812e65f42681e7ade107ad1c703532e2cf1e17
Author: Sergey Sharybin
Date:   Fri Apr 10 22:35:10 2015 +0500
Branches: master
https://developer.blender.org/rB35812e65f42681e7ade107ad1c703532e2cf1e17

Cycles: Fix compilation error on windows after recent logging changes

===================================================================

M	intern/cycles/device/device_cpu.cpp

===================================================================

diff --git a/intern/cycles/device/device_cpu.cpp b/intern/cycles/device/device_cpu.cpp
index 63735df..013f656 100644
--- a/intern/cycles/device/device_cpu.cpp
+++ b/intern/cycles/device/device_cpu.cpp
@@ -19,6 +19,15 @@
 
 /* So ImathMath is included before our kernel_cpu_compat. */
 #ifdef WITH_OSL
+#  if defined(_MSC_VER)
+/* Prevent OSL from polluting the context with weird macros from windows.h.
+ * TODO(sergey): Ideally it's only enough to have class/struct declarations in
+ * the header and skip header include here.
+ */
+#    define NOGDI
+#    define NOMINMAX
+#    define WIN32_LEAN_AND_MEAN
+#  endif
 #  include <OSL/oslexec.h>
 #endif