[Bf-blender-cvs] [c171f0b3c96] master: Fix Cycles build on Windows

[Dalai Felinto]

Commit: c171f0b3c96cb2d01fd6b6919f4dbec1a81c8da9
Author: Dalai Felinto
Date:   Wed May 3 21:16:45 2017 +0200
Branches: master
https://developer.blender.org/rBc171f0b3c96cb2d01fd6b6919f4dbec1a81c8da9

Fix Cycles build on Windows

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

M	intern/cycles/util/util_types.h

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

diff --git a/intern/cycles/util/util_types.h b/intern/cycles/util/util_types.h
index aacf7c1bd8e..feab7996aee 100644
--- a/intern/cycles/util/util_types.h
+++ b/intern/cycles/util/util_types.h
@@ -94,6 +94,7 @@ CCL_NAMESPACE_BEGIN
 #ifndef __KERNEL_OPENCL__
 typedef unsigned char uchar;
 typedef unsigned int uint;
+typedef unsigned short ushort;
 #endif
 
 /* Fixed Bits Types */