Warning fixes

2 files changed, 4 insertions, 2 deletions

diff --git a/source/blender/blenkernel/BKE_utildefines.h b/source/blender/blenkernel/BKE_utildefines.h
index b33aa3d163c..edb2d37c2c0 100644
--- a/source/blender/blenkernel/BKE_utildefines.h
+++ b/source/blender/blenkernel/BKE_utildefines.h
@@ -260,8 +260,6 @@ behaviour, though it may not be the best in practice.
 /*set the count of the array*/
 #define V_SETCOUNT(vec, count) _##vec##_count = (count)
 
-#endif
-
 /*little macro so inline keyword works*/
 #if defined(_MSC_VER)
 #define BM_INLINE static __forceinline
@@ -270,3 +268,5 @@ behaviour, though it may not be the best in practice.
 #endif
 
 #define BMEMSET(mem, val, size) {unsigned int _i; char *_c = (char*) mem; for (_i=0; _i<size; _i++) *_c++ = val;}
+
+#endif
diff --git a/source/blender/blenlib/intern/BLI_kdtree.c b/source/blender/blenlib/intern/BLI_kdtree.c
index abf61bfb734..997a3b1d043 100644
--- a/source/blender/blenlib/intern/BLI_kdtree.c
+++ b/source/blender/blenlib/intern/BLI_kdtree.c
@@ -37,7 +37,9 @@
 #include "BLI_math.h"
 #include "BLI_kdtree.h"
 
+#ifndef SWAP
 #define SWAP(type, a, b) { type sw_ap; sw_ap=(a); (a)=(b); (b)=sw_ap; }
+#endif
 
 typedef struct KDTreeNode {
 	struct KDTreeNode *left, *right;