[Bf-blender-cvs] [938840d] compositor-2016: Fix compilation error on 32 bit Windows
Sergey Sharybin
noreply at git.blender.org
Wed Jun 8 21:53:16 CEST 2016
Commit: 938840daa1dca24491fe77a0db7ae2b403e0d4ea
Author: Sergey Sharybin
Date: Mon Jun 6 14:01:19 2016 +0200
Branches: compositor-2016
https://developer.blender.org/rB938840daa1dca24491fe77a0db7ae2b403e0d4ea
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()
More information about the Bf-blender-cvs
mailing list