Cycles: Some cleanup, should be no functional changes

Addressing meaningful feedback from coverity.
2016-02-16 15:32:26 +01:00
parent 21c88df7c7
commit d0246d5f30
3 changed files with 5 additions and 5 deletions
--- a/intern/cycles/util/util_aligned_malloc.cpp
+++ b/intern/cycles/util/util_aligned_malloc.cpp
@@ -44,8 +44,7 @@ void *util_aligned_malloc(size_t size, int alignment)
 {
 #ifdef WITH_BLENDER_GUARDEDALLOC
 	return MEM_mallocN_aligned(size, alignment, "Cycles Aligned Alloc");
-#endif
-#ifdef _WIN32
+#elif defined(_WIN32)
 	return _aligned_malloc(size, alignment);
 #elif defined(__APPLE__)
 	/* On Mac OS X, both the heap and the stack are guaranteed 16-byte aligned so