diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2007-12-14 18:36:11 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2007-12-14 18:36:11 +0300 |
| commit | 3319ecdcd1e0deb07c89964f734c7eea7f416105 (patch) | |
| tree | 66e4768e0f6f6de596884caf7e47e6393649cb59 /intern/elbeem | |
| parent | f1b78cb4dad743ca5cff5eeacd7a6032590adba7 (diff) | |
include <ieeefp.h> on solaris and remove incorrect macro so finite() is now correct
Diffstat (limited to 'intern/elbeem')
| -rw-r--r-- | intern/elbeem/intern/isosurface.cpp | 8 | ||||
| -rw-r--r-- | intern/elbeem/intern/solver_adap.cpp | 7 | ||||
| -rw-r--r-- | intern/elbeem/intern/solver_main.cpp | 6 |
3 files changed, 3 insertions, 18 deletions
diff --git a/intern/elbeem/intern/isosurface.cpp b/intern/elbeem/intern/isosurface.cpp index 5f64378e2b6..1b0ba13c707 100644 --- a/intern/elbeem/intern/isosurface.cpp +++ b/intern/elbeem/intern/isosurface.cpp @@ -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 *****************************************************************************/ diff --git a/intern/elbeem/intern/solver_adap.cpp b/intern/elbeem/intern/solver_adap.cpp index d102f689730..5616d805232 100644 --- a/intern/elbeem/intern/solver_adap.cpp +++ b/intern/elbeem/intern/solver_adap.cpp @@ -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 /*****************************************************************************/ diff --git a/intern/elbeem/intern/solver_main.cpp b/intern/elbeem/intern/solver_main.cpp index fe57f57eff4..13ebf91b696 100644 --- a/intern/elbeem/intern/solver_main.cpp +++ b/intern/elbeem/intern/solver_main.cpp @@ -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 */ |