[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12884] trunk/blender/intern/elbeem/intern : include <ieeefp.h> on solaris and remove incorrect macro so finite() is now correct
Campbell Barton
ideasman42 at gmail.com
Fri Dec 14 16:36:11 CET 2007
Revision: 12884
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12884
Author: campbellbarton
Date: 2007-12-14 16:36:11 +0100 (Fri, 14 Dec 2007)
Log Message:
-----------
include <ieeefp.h> on solaris and remove incorrect macro so finite() is now correct
Modified Paths:
--------------
trunk/blender/intern/elbeem/intern/isosurface.cpp
trunk/blender/intern/elbeem/intern/solver_adap.cpp
trunk/blender/intern/elbeem/intern/solver_main.cpp
Modified: trunk/blender/intern/elbeem/intern/isosurface.cpp
===================================================================
--- trunk/blender/intern/elbeem/intern/isosurface.cpp 2007-12-14 13:57:43 UTC (rev 12883)
+++ trunk/blender/intern/elbeem/intern/isosurface.cpp 2007-12-14 15:36:11 UTC (rev 12884)
@@ -13,21 +13,15 @@
#include <algorithm>
#include <stdio.h>
-#if !defined(linux) && (defined (__sparc) || defined (__sparc__))
+#if (defined (__sun__) || defined (__sun)) || (!defined(linux) && (defined (__sparc) || defined (__sparc__)))
#include <ieeefp.h>
#endif
-
// just use default rounding for platforms where its not available
#ifndef round
#define round(x) (x)
#endif
-// GCC 3.4.3 on solaris 10 dosnt have finite, win32 also just does this
-#ifndef finite
-# define finite(x) (x>=0.0)
-#endif
-
/******************************************************************************
* Constructor
*****************************************************************************/
Modified: trunk/blender/intern/elbeem/intern/solver_adap.cpp
===================================================================
--- trunk/blender/intern/elbeem/intern/solver_adap.cpp 2007-12-14 13:57:43 UTC (rev 12883)
+++ trunk/blender/intern/elbeem/intern/solver_adap.cpp 2007-12-14 15:36:11 UTC (rev 12884)
@@ -11,15 +11,10 @@
#include "solver_relax.h"
#include "particletracer.h"
-#if !defined(linux) && (defined (__sparc) || defined (__sparc__))
+#if (defined (__sun__) || defined (__sun)) || (!defined(linux) && (defined (__sparc) || defined (__sparc__)))
#include <ieeefp.h>
#endif
-// GCC 3.4.3 on solaris 10 dosnt have finite, win32 also just does this
-#ifndef finite
-# define finite(x) (x>=0.0)
-#endif
-
/*****************************************************************************/
//! coarse step functions
/*****************************************************************************/
Modified: trunk/blender/intern/elbeem/intern/solver_main.cpp
===================================================================
--- trunk/blender/intern/elbeem/intern/solver_main.cpp 2007-12-14 13:57:43 UTC (rev 12883)
+++ trunk/blender/intern/elbeem/intern/solver_main.cpp 2007-12-14 15:36:11 UTC (rev 12884)
@@ -13,14 +13,10 @@
#include "loop_tools.h"
#include <stdlib.h>
-#if !defined(linux) && (defined (__sparc) || defined (__sparc__))
+#if (defined (__sun__) || defined (__sun)) || (!defined(linux) && (defined (__sparc) || defined (__sparc__)))
#include <ieeefp.h>
#endif
-// GCC 3.4.3 on solaris 10 dosnt have finite, win32 also just does this
-#ifndef finite
-# define finite(x) (x>=0.0)
-#endif
/*****************************************************************************/
/*! perform a single LBM step */
More information about the Bf-blender-cvs
mailing list