diff options
| author | Kent Mein <mein@cs.umn.edu> | 2005-10-11 22:07:37 +0400 |
|---|---|---|
| committer | Kent Mein <mein@cs.umn.edu> | 2005-10-11 22:07:37 +0400 |
| commit | c6524703d36e4d58913fb41e6e857b94894aa7e8 (patch) | |
| tree | c70217479fc059934c862c9db4ca3d69b39599e5 /intern | |
| parent | 1f0b9b3167b0b9ec37a790e590b4d16dc5dbc346 (diff) | |
A couple of small fixes to get things working on solaris.
added #include <ieeefp.h> similar to where its included in
other files. (made an ifdef that matches other includes of the same
file)
solaris does a lot of type overloading so there is no expf its just exp
so I added a #define expf exp wrapped in an ifndef
Finally, I fixed a warning in cfglexer.cpp about multiply defined
yy_wrap functions.
Kent
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/elbeem/intern/cfglexer.cpp | 1 | ||||
| -rw-r--r-- | intern/elbeem/intern/isosurface.cpp | 4 | ||||
| -rw-r--r-- | intern/elbeem/intern/lbmfsgrsolver.h | 7 |
3 files changed, 10 insertions, 2 deletions
diff --git a/intern/elbeem/intern/cfglexer.cpp b/intern/elbeem/intern/cfglexer.cpp index c8492f8105c..67f759d834b 100644 --- a/intern/elbeem/intern/cfglexer.cpp +++ b/intern/elbeem/intern/cfglexer.cpp @@ -812,7 +812,6 @@ char charBuffer[ CHAR_BUFFER_SIZE ]; int lineCount = 1; -extern "C" int yy_wrap (void ) { return 1; } #define YY_NO_UNISTD_H /*----------------------------------------------------------------------------*/ diff --git a/intern/elbeem/intern/isosurface.cpp b/intern/elbeem/intern/isosurface.cpp index 6322ed76fab..fecb5ed4bf8 100644 --- a/intern/elbeem/intern/isosurface.cpp +++ b/intern/elbeem/intern/isosurface.cpp @@ -14,7 +14,9 @@ #include <algorithm> #include <stdio.h> - +#if !defined(linux) && (defined (__sparc) || defined (__sparc__)) +#include <ieeefp.h> +#endif /****************************************************************************** * Constructor diff --git a/intern/elbeem/intern/lbmfsgrsolver.h b/intern/elbeem/intern/lbmfsgrsolver.h index cf199f46603..074522a9708 100644 --- a/intern/elbeem/intern/lbmfsgrsolver.h +++ b/intern/elbeem/intern/lbmfsgrsolver.h @@ -33,6 +33,13 @@ extern "C" { #include "ntl_scene.h" #include <stdio.h> +#if !defined(linux) && (defined (__sparc) || defined (__sparc__)) +#include <ieeefp.h> + #ifndef expf + #define expf exp + #endif +#endif + #if PARALLEL==1 #include <omp.h> #endif // PARALLEL=1 |