Check that HOST_SOLARIS is defined before relying on its value.

Spotted by Joachim Henke.


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2712 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
ths 2007-04-22 17:16:54 +00:00
parent a68156d016
commit fc81ba536b
2 changed files with 3 additions and 3 deletions

View File

@ -30,7 +30,7 @@ void set_floatx80_rounding_precision(int val STATUS_PARAM)
#define sqrtf(f) ((float)sqrt(f)) #define sqrtf(f) ((float)sqrt(f))
#define remainderf(fa, fb) ((float)remainder(fa, fb)) #define remainderf(fa, fb) ((float)remainder(fa, fb))
#define rintf(f) ((float)rint(f)) #define rintf(f) ((float)rint(f))
#if !defined(__sparc__) && HOST_SOLARIS < 10 #if !defined(__sparc__) && defined(HOST_SOLARIS) && HOST_SOLARIS < 10
extern long double rintl(long double); extern long double rintl(long double);
extern long double scalbnl(long double, int); extern long double scalbnl(long double, int);
@ -336,7 +336,7 @@ uint64_t float64_to_uint64_round_to_zero (float64 a STATUS_PARAM)
/*---------------------------------------------------------------------------- /*----------------------------------------------------------------------------
| Software IEC/IEEE double-precision operations. | Software IEC/IEEE double-precision operations.
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/
#if ( defined(__sun__) && ( HOST_SOLARIS < 10 )) #if defined(__sun__) && defined(HOST_SOLARIS) && HOST_SOLARIS < 10
static inline float64 trunc(float64 x) static inline float64 trunc(float64 x)
{ {
return x < 0 ? -floor(-x) : floor(x); return x < 0 ? -floor(-x) : floor(x);

View File

@ -15,7 +15,7 @@
* Solaris 10 with GCC4 does not need these macros as they * Solaris 10 with GCC4 does not need these macros as they
* are defined in <iso/math_c99.h> with a compiler directive * are defined in <iso/math_c99.h> with a compiler directive
*/ */
#if defined(HOST_SOLARIS) && (( HOST_SOLARIS <= 9 ) || ( ( HOST_SOLARIS >= 10 ) && ( __GNUC__ <= 4) )) #if defined(HOST_SOLARIS) && (( HOST_SOLARIS <= 9 ) || ((HOST_SOLARIS >= 10) && (__GNUC__ <= 4)))
/* /*
* C99 7.12.3 classification macros * C99 7.12.3 classification macros
* and * and