[Bf-blender-cvs] [c276480] master: Fix compilation error on 32 bit Windows

[Sergey Sharybin]

Commit: c276480b0f289dd36566447368de52ade39b53f1
Author: Sergey Sharybin
Date:   Mon Jun 6 14:01:19 2016 +0200
Branches: master
https://developer.blender.org/rBc276480b0f289dd36566447368de52ade39b53f1

Fix compilation error on 32 bit Windows

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

M       intern/cycles/util/util_windows.cpp

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

diff --git a/intern/cycles/util/util_windows.cpp 
b/intern/cycles/util/util_windows.cpp
index 6fd2597..ee5b3fd 100644
--- a/intern/cycles/util/util_windows.cpp
+++ b/intern/cycles/util/util_windows.cpp
@@ -20,7 +20,9 @@
 
 CCL_NAMESPACE_BEGIN
 
-#include <VersionHelpers.h>
+#ifdef _M_X64
+#  include <VersionHelpers.h>
+#endif
 
 #if _WIN32_WINNT < 0x0601
 tGetActiveProcessorGroupCount *GetActiveProcessorGroupCount;
@@ -50,7 +52,11 @@ static BOOL SetThreadGroupAffinity_stub(
 
 static bool supports_numa()
 {
+#ifndef _M_X64
+       return false;
+#else
        return IsWindows7OrGreater();
+#endif
 }
 
 void util_windows_init_numa_groups()

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs