[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11903] trunk/blender/intern: This covers bugs # 7130 7131 7132 7133
Kent Mein
mein at cs.umn.edu
Fri Aug 31 17:47:46 CEST 2007
Revision: 11903
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11903
Author: sirdude
Date: 2007-08-31 17:47:45 +0200 (Fri, 31 Aug 2007)
Log Message:
-----------
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
Modified Paths:
--------------
trunk/blender/intern/elbeem/intern/isosurface.cpp
trunk/blender/intern/elbeem/intern/simulation_object.cpp
trunk/blender/intern/elbeem/intern/solver_class.h
trunk/blender/intern/elbeem/intern/solver_interface.cpp
trunk/blender/intern/elbeem/intern/solver_main.cpp
trunk/blender/intern/elbeem/intern/utilities.h
trunk/blender/intern/ghost/intern/GHOST_WindowX11.cpp
trunk/blender/intern/iksolver/intern/IK_QJacobianSolver.cpp
trunk/blender/intern/string/intern/STR_String.cpp
Modified: trunk/blender/intern/elbeem/intern/isosurface.cpp
===================================================================
--- trunk/blender/intern/elbeem/intern/isosurface.cpp 2007-08-31 07:42:06 UTC (rev 11902)
+++ trunk/blender/intern/elbeem/intern/isosurface.cpp 2007-08-31 15:47:45 UTC (rev 11903)
@@ -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)
Modified: trunk/blender/intern/elbeem/intern/simulation_object.cpp
===================================================================
--- trunk/blender/intern/elbeem/intern/simulation_object.cpp 2007-08-31 07:42:06 UTC (rev 11902)
+++ trunk/blender/intern/elbeem/intern/simulation_object.cpp 2007-08-31 15:47:45 UTC (rev 11903)
@@ -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
Modified: trunk/blender/intern/elbeem/intern/solver_class.h
===================================================================
--- trunk/blender/intern/elbeem/intern/solver_class.h 2007-08-31 07:42:06 UTC (rev 11902)
+++ trunk/blender/intern/elbeem/intern/solver_class.h 2007-08-31 15:47:45 UTC (rev 11903)
@@ -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
Modified: trunk/blender/intern/elbeem/intern/solver_interface.cpp
===================================================================
--- trunk/blender/intern/elbeem/intern/solver_interface.cpp 2007-08-31 07:42:06 UTC (rev 11902)
+++ trunk/blender/intern/elbeem/intern/solver_interface.cpp 2007-08-31 15:47:45 UTC (rev 11903)
@@ -17,6 +17,7 @@
#include "ntl_world.h"
#include "elbeem.h"
+#include <stdlib.h> /* getenv(3) - also in linux */
Modified: trunk/blender/intern/elbeem/intern/solver_main.cpp
===================================================================
--- trunk/blender/intern/elbeem/intern/solver_main.cpp 2007-08-31 07:42:06 UTC (rev 11902)
+++ trunk/blender/intern/elbeem/intern/solver_main.cpp 2007-08-31 15:47:45 UTC (rev 11903)
@@ -7,6 +7,7 @@
*
*****************************************************************************/
+#include <stdlib.h> /* rand(3) - also in linux */
#include "solver_class.h"
#include "solver_relax.h"
#include "particletracer.h"
Modified: trunk/blender/intern/elbeem/intern/utilities.h
===================================================================
--- trunk/blender/intern/elbeem/intern/utilities.h 2007-08-31 07:42:06 UTC (rev 11902)
+++ trunk/blender/intern/elbeem/intern/utilities.h 2007-08-31 15:47:45 UTC (rev 11903)
@@ -9,7 +9,12 @@
#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
#define DEBUG 0
Modified: trunk/blender/intern/ghost/intern/GHOST_WindowX11.cpp
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_WindowX11.cpp 2007-08-31 07:42:06 UTC (rev 11902)
+++ trunk/blender/intern/ghost/intern/GHOST_WindowX11.cpp 2007-08-31 15:47:45 UTC (rev 11903)
@@ -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.
Modified: trunk/blender/intern/iksolver/intern/IK_QJacobianSolver.cpp
===================================================================
--- trunk/blender/intern/iksolver/intern/IK_QJacobianSolver.cpp 2007-08-31 07:42:06 UTC (rev 11902)
+++ trunk/blender/intern/iksolver/intern/IK_QJacobianSolver.cpp 2007-08-31 15:47:45 UTC (rev 11903)
@@ -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);
Modified: trunk/blender/intern/string/intern/STR_String.cpp
===================================================================
--- trunk/blender/intern/string/intern/STR_String.cpp 2007-08-31 07:42:06 UTC (rev 11902)
+++ trunk/blender/intern/string/intern/STR_String.cpp 2007-08-31 15:47:45 UTC (rev 11903)
@@ -41,6 +41,7 @@
#include <stdarg.h>
#include <stdlib.h>
#include <ctype.h>
+#include <string.h>
#include "STR_String.h"
/*-------------------------------------------------------------------------------------------------
More information about the Bf-blender-cvs
mailing list