diff options
author | Kent Mein <mein@cs.umn.edu> | 2007-08-31 19:47:45 +0400 |
---|---|---|
committer | Kent Mein <mein@cs.umn.edu> | 2007-08-31 19:47:45 +0400 |
commit | 6e91048bff139fba671a636e59ad99471658b3d8 (patch) | |
tree | 36202ab74fbe1fcc9fe3e630df79d039043dd80a /intern | |
parent | c1e9ad9c8006afe3d4259be21a824a5fd3c437d0 (diff) |
This covers bugs # 7130 7131 7132 7133
All small patches submitted by Vladimar Marek (neuron)
Basically fixes up some headers for Solaris's compiler.
Kent
Diffstat (limited to 'intern')
-rw-r--r-- | intern/elbeem/intern/isosurface.cpp | 5 | ||||
-rw-r--r-- | intern/elbeem/intern/simulation_object.cpp | 1 | ||||
-rw-r--r-- | intern/elbeem/intern/solver_class.h | 5 | ||||
-rw-r--r-- | intern/elbeem/intern/solver_interface.cpp | 1 | ||||
-rw-r--r-- | intern/elbeem/intern/solver_main.cpp | 1 | ||||
-rw-r--r-- | intern/elbeem/intern/utilities.h | 5 | ||||
-rw-r--r-- | intern/ghost/intern/GHOST_WindowX11.cpp | 5 | ||||
-rw-r--r-- | intern/iksolver/intern/IK_QJacobianSolver.cpp | 3 | ||||
-rw-r--r-- | intern/string/intern/STR_String.cpp | 1 |
9 files changed, 17 insertions, 10 deletions
diff --git a/intern/elbeem/intern/isosurface.cpp b/intern/elbeem/intern/isosurface.cpp index 9646e8581da..9925565b85d 100644 --- a/intern/elbeem/intern/isosurface.cpp +++ b/intern/elbeem/intern/isosurface.cpp @@ -13,11 +13,6 @@ #include <algorithm> #include <stdio.h> -// sirdude fix for solaris -#if !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/simulation_object.cpp b/intern/elbeem/intern/simulation_object.cpp index 19bdb119681..2ff600a36d4 100644 --- a/intern/elbeem/intern/simulation_object.cpp +++ b/intern/elbeem/intern/simulation_object.cpp @@ -15,6 +15,7 @@ #include "solver_interface.h" #include "particletracer.h" #include "elbeem.h" +#include <stdlib.h> /* exit(3) - also in linux */ #ifdef _WIN32 #else diff --git a/intern/elbeem/intern/solver_class.h b/intern/elbeem/intern/solver_class.h index e6b1ad4ed53..930c1863aa7 100644 --- a/intern/elbeem/intern/solver_class.h +++ b/intern/elbeem/intern/solver_class.h @@ -99,10 +99,9 @@ #define LBM_INLINED inline // sirdude fix for solaris -#if !defined(linux) && (defined (__sparc) || defined (__sparc__)) -#include <ieeefp.h> +#if !defined(linux) && defined(sun) #ifndef expf -#define expf exp +#define expf(a) exp((double)(a)) #endif #endif diff --git a/intern/elbeem/intern/solver_interface.cpp b/intern/elbeem/intern/solver_interface.cpp index 8dcfa495b95..b50e409bce5 100644 --- a/intern/elbeem/intern/solver_interface.cpp +++ b/intern/elbeem/intern/solver_interface.cpp @@ -17,6 +17,7 @@ #include "ntl_world.h" #include "elbeem.h" +#include <stdlib.h> /* getenv(3) - also in linux */ diff --git a/intern/elbeem/intern/solver_main.cpp b/intern/elbeem/intern/solver_main.cpp index bced75ab444..270e8867b3c 100644 --- a/intern/elbeem/intern/solver_main.cpp +++ b/intern/elbeem/intern/solver_main.cpp @@ -7,6 +7,7 @@ * *****************************************************************************/ +#include <stdlib.h> /* rand(3) - also in linux */ #include "solver_class.h" #include "solver_relax.h" #include "particletracer.h" diff --git a/intern/elbeem/intern/utilities.h b/intern/elbeem/intern/utilities.h index 4d887c3f99b..e5e02be331d 100644 --- a/intern/elbeem/intern/utilities.h +++ b/intern/elbeem/intern/utilities.h @@ -9,6 +9,11 @@ #ifndef UTILITIES_H #include "ntl_vector3dim.h" +// Solaris requires ieeefp.h for finite(3C) +#if !defined(linux) && defined(sun) +#include <ieeefp.h> +#endif + /* debugging outputs , debug level 0 (off) to 10 (max) */ #ifdef ELBEEM_PLUGIN diff --git a/intern/ghost/intern/GHOST_WindowX11.cpp b/intern/ghost/intern/GHOST_WindowX11.cpp index db75dc721e5..30fa30e59e6 100644 --- a/intern/ghost/intern/GHOST_WindowX11.cpp +++ b/intern/ghost/intern/GHOST_WindowX11.cpp @@ -38,6 +38,11 @@ #include <X11/cursorfont.h> #include <X11/Xatom.h> +#if defined(__sun__) || defined( __sun ) || defined (__sparc) || defined (__sparc__) +#include <strings.h> +#endif + + // For obscure full screen mode stuuf // lifted verbatim from blut. diff --git a/intern/iksolver/intern/IK_QJacobianSolver.cpp b/intern/iksolver/intern/IK_QJacobianSolver.cpp index 7cfdcccc2ad..ea18f0b2003 100644 --- a/intern/iksolver/intern/IK_QJacobianSolver.cpp +++ b/intern/iksolver/intern/IK_QJacobianSolver.cpp @@ -30,10 +30,9 @@ * ***** END GPL/BL DUAL LICENSE BLOCK ***** */ +#include <stdio.h> #include "IK_QJacobianSolver.h" -//#include "analyze.h" - void IK_QJacobianSolver::AddSegmentList(IK_QSegment *seg) { m_segments.push_back(seg); diff --git a/intern/string/intern/STR_String.cpp b/intern/string/intern/STR_String.cpp index c243bc28224..af8f0d11445 100644 --- a/intern/string/intern/STR_String.cpp +++ b/intern/string/intern/STR_String.cpp @@ -41,6 +41,7 @@ #include <stdarg.h> #include <stdlib.h> #include <ctype.h> +#include <string.h> #include "STR_String.h" /*------------------------------------------------------------------------------------------------- |