[Bf-blender-cvs] [af7343a] master: Cycles: Attempt to fix compilation error on ppc64el
Sergey Sharybin
noreply at git.blender.org
Mon Nov 21 13:42:52 CET 2016
Commit: af7343ae22ee1f2f31a7e47a86e43dda4bbaa6d6
Author: Sergey Sharybin
Date: Mon Nov 21 13:32:41 2016 +0100
Branches: master
https://developer.blender.org/rBaf7343ae22ee1f2f31a7e47a86e43dda4bbaa6d6
Cycles: Attempt to fix compilation error on ppc64el
There is some define conflict between system headers and clew,
so delay include of clew.h as much as possible.]
This is something which needed to be done in the code before
the refactor, hopefully such change will still work.
===================================================================
M intern/cycles/device/opencl/opencl.h
===================================================================
diff --git a/intern/cycles/device/opencl/opencl.h b/intern/cycles/device/opencl/opencl.h
index 054ac90..4023ba8 100644
--- a/intern/cycles/device/opencl/opencl.h
+++ b/intern/cycles/device/opencl/opencl.h
@@ -16,14 +16,14 @@
#ifdef WITH_OPENCL
-#include "clew.h"
-
#include "device.h"
#include "util_map.h"
#include "util_param.h"
#include "util_string.h"
+#include "clew.h"
+
CCL_NAMESPACE_BEGIN
#define CL_MEM_PTR(p) ((cl_mem)(uintptr_t)(p))
More information about the Bf-blender-cvs
mailing list