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 /lib/erl_interface/src/decode | |
| 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 'lib/erl_interface/src/decode')
| -rw-r--r-- | lib/erl_interface/src/decode/decode_big.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/lib/erl_interface/src/decode/decode_big.c b/lib/erl_interface/src/decode/decode_big.c index b54ac85be2..b87d97d634 100644 --- a/lib/erl_interface/src/decode/decode_big.c +++ b/lib/erl_interface/src/decode/decode_big.c @@ -151,13 +151,18 @@ int ei_big_comp(erlang_big *x, erlang_big *y) #endif #ifdef USE_ISINF_ISNAN /* simulate finite() */ -# define finite(f) (!isinf(f) && !isnan(f)) -# define HAVE_FINITE +# define isfinite(f) (!isinf(f) && !isnan(f)) +# define HAVE_ISFINITE +#elif defined(isfinite) && !defined(HAVE_ISFINITE) +# define HAVE_ISFINITE +#elif !defined(HAVE_ISFINITE) && defined(HAVE_FINITE) +# define isfinite finite +# define HAVE_ISFINITE #endif #ifdef NO_FPE_SIGNALS # define ERTS_FP_CHECK_INIT() do {} while (0) -# define ERTS_FP_ERROR(f, Action) if (!finite(f)) { Action; } else {} +# define ERTS_FP_ERROR(f, Action) if (!isfinite(f)) { Action; } else {} # define ERTS_SAVE_FP_EXCEPTION() # define ERTS_RESTORE_FP_EXCEPTION() #else |