Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2011-08-09 22:53:54 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2011-08-09 22:53:54 +0400
commitabc601d10ee51aa8de83004094e2e6c73e96e2eb (patch)
treed1b9c16183f4138a85732ffb443578d7d1ae359e /intern/cycles/util/util_types.h
parent40886b6965062f84a7b3d8b73b79027e2a4e3caf (diff)
Cycles: opencl 1.1 compatibility tweaks.
Diffstat (limited to 'intern/cycles/util/util_types.h')
-rw-r--r--intern/cycles/util/util_types.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/intern/cycles/util/util_types.h b/intern/cycles/util/util_types.h
index 02ab59a261f..12ae60f1143 100644
--- a/intern/cycles/util/util_types.h
+++ b/intern/cycles/util/util_types.h
@@ -70,9 +70,13 @@ CCL_NAMESPACE_BEGIN
/* Shorter Unsigned Names */
+#ifndef __KERNEL_OPENCL__
+
typedef unsigned char uchar;
typedef unsigned int uint;
+#endif
+
#ifndef __KERNEL_GPU__
/* Fixed Bits Types */