diff options
| author | Daniel Genrich <daniel.genrich@gmx.net> | 2007-12-18 20:29:35 +0300 |
|---|---|---|
| committer | Daniel Genrich <daniel.genrich@gmx.net> | 2007-12-18 20:29:35 +0300 |
| commit | a8a5776160eb405da1653be3ae7f2d6d51fd677c (patch) | |
| tree | 32a3fff3d7d1b34a92ad592cab9aa6153e5bca70 /intern/elbeem | |
| parent | 3bf1536f5ed210fb8832f782999ca6a072a6a3c6 (diff) | |
| parent | 84b58f8653218ff10f701cfef402c4f699a9b0d2 (diff) | |
svn merge -r 12856:12937 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Diffstat (limited to 'intern/elbeem')
| -rw-r--r-- | intern/elbeem/intern/isosurface.cpp | 3 | ||||
| -rw-r--r-- | intern/elbeem/intern/solver_adap.cpp | 3 | ||||
| -rw-r--r-- | intern/elbeem/intern/solver_main.cpp | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/intern/elbeem/intern/isosurface.cpp b/intern/elbeem/intern/isosurface.cpp index 14aa22d06b5..f90621f3b73 100644 --- a/intern/elbeem/intern/isosurface.cpp +++ b/intern/elbeem/intern/isosurface.cpp @@ -13,11 +13,10 @@ #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) diff --git a/intern/elbeem/intern/solver_adap.cpp b/intern/elbeem/intern/solver_adap.cpp index b56b1c14f2c..5616d805232 100644 --- a/intern/elbeem/intern/solver_adap.cpp +++ b/intern/elbeem/intern/solver_adap.cpp @@ -11,11 +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 - /*****************************************************************************/ //! coarse step functions /*****************************************************************************/ diff --git a/intern/elbeem/intern/solver_main.cpp b/intern/elbeem/intern/solver_main.cpp index 3d629d673f1..7b91724a640 100644 --- a/intern/elbeem/intern/solver_main.cpp +++ b/intern/elbeem/intern/solver_main.cpp @@ -13,7 +13,7 @@ #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 |