diff options
| author | Anthony Ramine <[email protected]> | 2013-11-14 17:03:40 +0100 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2014-10-28 11:40:45 +0100 |
| commit | 4d73c647b55977d23c4295073945bd8aeb91ff83 (patch) | |
| tree | 2a40eb4e0c28c674e0ce9be2319563dd6f0605f5 /erts/emulator/test | |
| parent | 1aa1a4f6173e9ef59ac0b6bb054368c141000062 (diff) | |
| download | otp-4d73c647b55977d23c4295073945bd8aeb91ff83.tar.gz otp-4d73c647b55977d23c4295073945bd8aeb91ff83.tar.bz2 otp-4d73c647b55977d23c4295073945bd8aeb91ff83.zip | |
Use isfinite() instead of finite() when available
OS X Mavericks builds result in a number of warnings about finite() being
deprecated, like these:
beam/erl_arith.c:451:7: warning: 'finite' is deprecated: first deprecated in OS X 10.9 [-Wdeprecated-declarations]
ERTS_FP_ERROR(p, f1.fd, goto badarith);
^
sys/unix/erl_unix_sys.h:319:33: note: expanded from macro 'ERTS_FP_ERROR'
^
sys/unix/erl_unix_sys.h:244:51: note: expanded from macro '__ERTS_FP_ERROR'
^
/usr/include/math.h:718:12: note: 'finite' has been explicitly marked deprecated here
extern int finite(double) __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_0, __MAC_10_9, __IPHONE_NA, __IPHONE_NA);
Add checks to use isfinite() instead of finite() where available. Verified
on OS X Mavericks 10.9.5 and Ubuntu 12.04.
Diffstat (limited to 'erts/emulator/test')
| -rw-r--r-- | erts/emulator/test/float_SUITE_data/fp_drv.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/erts/emulator/test/float_SUITE_data/fp_drv.c b/erts/emulator/test/float_SUITE_data/fp_drv.c index b80385c3f9..82d18d6440 100644 --- a/erts/emulator/test/float_SUITE_data/fp_drv.c +++ b/erts/emulator/test/float_SUITE_data/fp_drv.c @@ -29,9 +29,14 @@ #if defined (__GNUC__) int _finite(double x); #endif -#ifndef finite -#define finite _finite +#ifndef isfinite +#define isfinite _finite #endif +#elif !defined(HAVE_ISFINITE) && defined(HAVE_FINITE) +/* If not windows and we do not have isfinite */ +#define isfinite finite +#elif !defined(HAVE_ISFINITE) +# error "No finite function found!" #endif #include "erl_driver.h" @@ -79,21 +84,21 @@ do_test(void *unused) x = 3.23e133; y = 3.57e257; z = x*y; - if (finite(z)) + if (isfinite(z)) return "is finite (1)"; x = 5.0; y = 0.0; z = x/y; - if (finite(z)) + if (isfinite(z)) return "is finite (2)"; z = log(-1.0); - if (finite(z)) + if (isfinite(z)) return "is finite (3)"; z = log(0.0); - if (finite(z)) + if (isfinite(z)) return "is finite (4)"; return "ok"; |