diff options
| author | Bryce Harrington <bryce@bryceharrington.org> | 2014-10-14 02:33:59 +0000 |
|---|---|---|
| committer | bryce <bryce@ubuntu.com> | 2014-10-14 02:33:59 +0000 |
| commit | 9c35de31702bb501f596555d347e9db76b248f14 (patch) | |
| tree | dac255d12c3191fb438bc51d02f3701899886537 /src | |
| parent | Fixed: "Called C++ object pointer is null" (diff) | |
| download | inkscape-9c35de31702bb501f596555d347e9db76b248f14.tar.gz inkscape-9c35de31702bb501f596555d347e9db76b248f14.zip | |
2geom: Re-fix IS_NAN and IS_FINITE for solaris
This patch should go upstream to 2geom...
(bzr r13610)
Diffstat (limited to 'src')
| -rw-r--r-- | src/2geom/math-utils.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/2geom/math-utils.h b/src/2geom/math-utils.h index 83c7b4f5e..0d5d3667b 100644 --- a/src/2geom/math-utils.h +++ b/src/2geom/math-utils.h @@ -111,7 +111,7 @@ inline void sincos(double angle, double &sin_, double &cos_) { # define IS_NAN(_a) (_isnan(_a)) /* Win32 definition */ #elif defined(isnan) || defined(__FreeBSD__) || defined(__osf__) # define IS_NAN(_a) (isnan(_a)) /* GNU definition */ -#elif defined (SOLARIS_2_8) && __GNUC__ == 3 && __GNUC_MINOR__ == 2 +#elif defined (SOLARIS) # define IS_NAN(_a) (isnan(_a)) /* GNU definition */ #else # define IS_NAN(_a) (boost::math::isnan(_a)) @@ -129,7 +129,7 @@ inline void sincos(double angle, double &sin_, double &cos_) { # define IS_FINITE(_a) (isfinite(_a)) #elif defined(__osf__) # define IS_FINITE(_a) (finite(_a) && !IS_NAN(_a)) -#elif defined (SOLARIS_2_8) && __GNUC__ == 3 && __GNUC_MINOR__ == 2 +#elif defined (SOLARIS) #include <ieeefp.h> #define IS_FINITE(_a) (finite(_a) && !IS_NAN(_a)) #else |