[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16060] branches/fluidcontrol: Bugfix for non-compiling on msvc and mingw (reported by Matt)

Daniel Genrich daniel.genrich at gmx.net
Tue Aug 12 11:36:52 CEST 2008


Revision: 16060
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16060
Author:   genscher
Date:     2008-08-12 11:36:51 +0200 (Tue, 12 Aug 2008)

Log Message:
-----------
Bugfix for non-compiling on msvc and mingw (reported by Matt)

Modified Paths:
--------------
    branches/fluidcontrol/intern/elbeem/intern/mvmcoords.h
    branches/fluidcontrol/source/blender/blenloader/intern/readfile.c

Modified: branches/fluidcontrol/intern/elbeem/intern/mvmcoords.h
===================================================================
--- branches/fluidcontrol/intern/elbeem/intern/mvmcoords.h	2008-08-11 20:40:29 UTC (rev 16059)
+++ branches/fluidcontrol/intern/elbeem/intern/mvmcoords.h	2008-08-12 09:36:51 UTC (rev 16060)
@@ -19,6 +19,13 @@
 #include <vector>
 #define mvmFloat double
 
+#ifdef WIN32
+#ifndef FREE_WINDOWS
+#define isnan(n) _isnan(n)
+#define finite _finite
+#endif
+#endif
+
 // weight and triangle index
 class mvmIndexWeight {
 	public:

Modified: branches/fluidcontrol/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/fluidcontrol/source/blender/blenloader/intern/readfile.c	2008-08-11 20:40:29 UTC (rev 16059)
+++ branches/fluidcontrol/source/blender/blenloader/intern/readfile.c	2008-08-12 09:36:51 UTC (rev 16060)
@@ -37,7 +37,10 @@
 #ifdef WIN32
 #include "winsock2.h"
 #include "BLI_winstuff.h"
+#ifndef INT_MAX
+#include "limits.h"
 #endif
+#endif
 
 #include <stdio.h> // for printf fopen fwrite fclose sprintf FILE
 #include <stdlib.h> // for getenv atoi





More information about the Bf-blender-cvs mailing list