[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26733] trunk/blender/source/blender: Warning fixes

[Damien Plisson]

Revision: 26733
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26733
Author:   damien78
Date:     2010-02-09 12:01:31 +0100 (Tue, 09 Feb 2010)

Log Message:
-----------
Warning fixes

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/BKE_utildefines.h
    trunk/blender/source/blender/blenlib/intern/BLI_kdtree.c

Modified: trunk/blender/source/blender/blenkernel/BKE_utildefines.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_utildefines.h	2010-02-09 09:56:04 UTC (rev 26732)
+++ trunk/blender/source/blender/blenkernel/BKE_utildefines.h	2010-02-09 11:01:31 UTC (rev 26733)
@@ -260,8 +260,6 @@
 /*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 @@
 #endif
 
 #define BMEMSET(mem, val, size) {unsigned int _i; char *_c = (char*) mem; for (_i=0; _i<size; _i++) *_c++ = val;}
+
+#endif

Modified: trunk/blender/source/blender/blenlib/intern/BLI_kdtree.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/BLI_kdtree.c	2010-02-09 09:56:04 UTC (rev 26732)
+++ trunk/blender/source/blender/blenlib/intern/BLI_kdtree.c	2010-02-09 11:01:31 UTC (rev 26733)
@@ -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;