From 47953dee79202e1074ddfd0f85a2f5fa6a73d3dd Mon Sep 17 00:00:00 2001
From: Brecht Van Lommel <brechtvanlommel@gmail.com>
Date: Sun, 28 Oct 2018 14:53:08 +0100
Subject: Fix Linux build after Cryptomatte commit.

---
 intern/cycles/util/util_murmurhash.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'intern/cycles/util')

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
 
-- 
cgit v1.2.3