This covers bugs # 7130 7131 7132 7133
authorKent Mein <mein@cs.umn.edu>
Fri, 31 Aug 2007 15:47:45 +0000 (15:47 +0000)
committerKent Mein <mein@cs.umn.edu>
Fri, 31 Aug 2007 15:47:45 +0000 (15:47 +0000)
All small patches submitted by Vladimar Marek (neuron)

Basically fixes up some headers for Solaris's compiler.

Kent

intern/elbeem/intern/isosurface.cpp
intern/elbeem/intern/simulation_object.cpp
intern/elbeem/intern/solver_class.h
intern/elbeem/intern/solver_interface.cpp
intern/elbeem/intern/solver_main.cpp
intern/elbeem/intern/utilities.h
intern/ghost/intern/GHOST_WindowX11.cpp
intern/iksolver/intern/IK_QJacobianSolver.cpp
intern/string/intern/STR_String.cpp

index 9646e8581da122def5c564dd6114e4743f4bd832..9925565b85d67f55fd6785d172db95ad5b33db9b 100644 (file)
 #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)
index 19bdb1196814458d15a098c445d615f7c3c68526..2ff600a36d4ee07324db1acfa997da8059371b48 100644 (file)
@@ -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
index e6b1ad4ed53c26ce0e905329dc7dd79a4fc05111..930c1863aa7bce2948be79753fa38a0bb22ddb0a 100644 (file)
 #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
 
index 8dcfa495b953eb78e71df28cbc43c993252945ef..b50e409bce5593b84d9baeb308987928abc29737 100644 (file)
@@ -17,6 +17,7 @@
 #include "ntl_world.h"
 #include "elbeem.h"
 
+#include <stdlib.h> /* getenv(3) - also in linux */
 
 
 
index bced75ab444275fafd08a43b1e70941e9ebd3427..270e8867b3cea2a6e7f4986143cb7bd407ea8bb9 100644 (file)
@@ -7,6 +7,7 @@
  *
  *****************************************************************************/
 
+#include <stdlib.h> /* rand(3) - also in linux */
 #include "solver_class.h"
 #include "solver_relax.h"
 #include "particletracer.h"
index 4d887c3f99bcb3c8190644f596c1c57347b22ee6..e5e02be331dd0eeef0951dd2a7110c63d06af874 100644 (file)
@@ -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
index db75dc721e5b31edb47092485817aeec4db728fe..30fa30e59e6233ffd013e64d2052c14cb3778c80 100644 (file)
 #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.
 
index 7cfdcccc2ad8687ea60ebd925190bcf73a8877f4..ea18f0b20036751017578b259983b5e60b85f1f0 100644 (file)
  * ***** 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);
index c243bc28224450e039c3425e0b8fd4abedee633d..af8f0d11445d105d183ceecc2490a1cf9e40714d 100644 (file)
@@ -41,6 +41,7 @@
 #include <stdarg.h>
 #include <stdlib.h> 
 #include <ctype.h>
+#include <string.h>
 #include "STR_String.h"
 
 /*-------------------------------------------------------------------------------------------------