[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47471] branches/soc-2012-fried_chicken/ source/blender/blenkernel/intern/smoke.c: Fixed smoke compile on non-Windows platforms: I had added the " ADD_IF_LOWER" macro inside a "#ifdef _WIN32" block...

[Miika Hamalainen]

Revision: 47471
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47471
Author:   miikah
Date:     2012-06-05 17:32:57 +0000 (Tue, 05 Jun 2012)
Log Message:
-----------
Fixed smoke compile on non-Windows platforms: I had added the "ADD_IF_LOWER" macro inside a "#ifdef _WIN32" block...

Modified Paths:
--------------
    branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/smoke.c

Modified: branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/smoke.c
===================================================================
--- branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/smoke.c	2012-06-05 15:40:02 UTC (rev 47470)
+++ branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/smoke.c	2012-06-05 17:32:57 UTC (rev 47471)
@@ -88,10 +88,6 @@
 #include <conio.h>
 #include <windows.h>
 
-#define ADD_IF_LOWER_POS(a,b) (MIN2((a)+(b), MAX2((a),(b))))
-#define ADD_IF_LOWER_NEG(a,b) (MAX2((a)+(b), MIN2((a),(b))))
-#define ADD_IF_LOWER(a,b) (((b)>0)?ADD_IF_LOWER_POS((a),(b)):ADD_IF_LOWER_NEG((a),(b)))
-
 static LARGE_INTEGER liFrequency;
 static LARGE_INTEGER liStartTime;
 static LARGE_INTEGER liCurrentTime;
@@ -141,6 +137,10 @@
 // timestep default value for nice appearance 0.1f
 #define DT_DEFAULT 0.1f
 
+#define ADD_IF_LOWER_POS(a,b) (MIN2((a)+(b), MAX2((a),(b))))
+#define ADD_IF_LOWER_NEG(a,b) (MAX2((a)+(b), MIN2((a),(b))))
+#define ADD_IF_LOWER(a,b) (((b)>0)?ADD_IF_LOWER_POS((a),(b)):ADD_IF_LOWER_NEG((a),(b)))
+
 /* forward declerations */
 static void calcTriangleDivs(Object *ob, MVert *verts, int numverts, MFace *tris, int numfaces, int numtris, int **tridivs, float cell_len);
 static void get_cell(float *p0, int res[3], float dx, float *pos, int *cell, int correct);