diff options
| author | su_v <suv-sf@users.sourceforge.net> | 2014-10-14 03:01:31 +0000 |
|---|---|---|
| committer | ~suv <suv-sf@users.sourceforge.net> | 2014-10-14 03:01:31 +0000 |
| commit | 1d2cec18d1038150b6511454a2fbb2b3cb6d36f8 (patch) | |
| tree | 38aeab42635a7ebfa0b87394e42d8bebbcdc7ce6 /src/2geom | |
| parent | update to trunk (r13586) (diff) | |
| parent | 2geom: Re-fix IS_NAN and IS_FINITE for solaris (diff) | |
| download | inkscape-1d2cec18d1038150b6511454a2fbb2b3cb6d36f8.tar.gz inkscape-1d2cec18d1038150b6511454a2fbb2b3cb6d36f8.zip | |
update to trunk (r13610)
(bzr r13506.1.112)
Diffstat (limited to 'src/2geom')
| -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 |