[Bf-blender-cvs] [41cc86a] master: Add include needed for clang, quiet warning

Campbell Barton noreply at git.blender.org
Sun Feb 2 11:34:49 CET 2014


Commit: 41cc86a666d22501f25c58d81b1b94020b8c997f
Author: Campbell Barton
Date:   Sun Feb 2 21:33:52 2014 +1100
https://developer.blender.org/rB41cc86a666d22501f25c58d81b1b94020b8c997f

Add include needed for clang, quiet warning

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

M	intern/cycles/kernel/kernel.cpp
M	source/blender/blenlib/intern/smallhash.c

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

diff --git a/intern/cycles/kernel/kernel.cpp b/intern/cycles/kernel/kernel.cpp
index 3fe1e80..6cd14d3 100644
--- a/intern/cycles/kernel/kernel.cpp
+++ b/intern/cycles/kernel/kernel.cpp
@@ -89,6 +89,11 @@ void kernel_tex_copy(KernelGlobals *kg, const char *name, device_ptr mem, size_t
 #define __KERNEL_SSE2__
 #endif
 
+/* quiet unused define warnings */
+#if defined(__KERNEL_SSE2__)
+	/* do nothing */
+#endif
+
 /* Path Tracing */
 
 void kernel_cpu_path_trace(KernelGlobals *kg, float *buffer, unsigned int *rng_state, int sample, int x, int y, int offset, int stride)
diff --git a/source/blender/blenlib/intern/smallhash.c b/source/blender/blenlib/intern/smallhash.c
index 38ebdc5..87ac1c4 100644
--- a/source/blender/blenlib/intern/smallhash.c
+++ b/source/blender/blenlib/intern/smallhash.c
@@ -50,6 +50,7 @@
 
 #include <string.h>
 #include <stdlib.h>
+#include <stdint.h>
 
 #include "MEM_guardedalloc.h"




More information about the Bf-blender-cvs mailing list