[Bf-blender-cvs] [47953dee792] master: Fix Linux build after Cryptomatte commit.

[Brecht Van Lommel]

Commit: 47953dee79202e1074ddfd0f85a2f5fa6a73d3dd
Author: Brecht Van Lommel
Date:   Sun Oct 28 14:53:08 2018 +0100
Branches: master
https://developer.blender.org/rB47953dee79202e1074ddfd0f85a2f5fa6a73d3dd

Fix Linux build after Cryptomatte commit.

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

M	build_files/cmake/macros.cmake
M	intern/cycles/util/util_murmurhash.cpp

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

diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
index e2af3667f2a..acbbdef6dd4 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -666,10 +666,10 @@ function(SETUP_BLENDER_SORTED_LIBS)
 		bf_intern_mikktspace
 		bf_intern_dualcon
 		bf_intern_cycles
+		cycles_device
 		cycles_render
 		cycles_graph
 		cycles_bvh
-		cycles_device
 		cycles_kernel
 		cycles_util
 		cycles_subd
diff --git a/intern/cycles/util/util_murmurhash.cpp b/intern/cycles/util/util_murmurhash.cpp
index c1f81e61b72..68b2f2031be 100644
--- a/intern/cycles/util/util_murmurhash.cpp
+++ b/intern/cycles/util/util_murmurhash.cpp
@@ -21,20 +21,22 @@
  *
  */
 
+#include <stdlib.h>
+#include <string.h>
+
 #include "util/util_algorithm.h"
 #include "util/util_murmurhash.h"
 
 #if defined(_MSC_VER)
-#  include <stdlib.h>
-#  define ROTL32(x,y)	_rotl(x,y)
-#  define ROTL64(x,y)	_rotl64(x,y)
+#  define ROTL32(x,y) _rotl(x,y)
+#  define ROTL64(x,y) _rotl64(x,y)
 #  define BIG_CONSTANT(x) (x)
 #else
 ccl_device_inline uint32_t rotl32(uint32_t x, int8_t r)
 {
 	return (x << r) | (x >> (32 - r));
 }
-#  define	ROTL32(x,y)	rotl32(x,y)
+#  define ROTL32(x,y) rotl32(x,y)
 #  define BIG_CONSTANT(x) (x##LLU)
 #endif