diff options
| author | Sverker Eriksson <[email protected]> | 2015-04-15 16:55:55 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2015-04-15 17:01:20 +0200 |
| commit | 8846021fe1b1bcf79ec3a01037a8a656e161766c (patch) | |
| tree | fce7b801da0daf9fcb3233e62111273572bc08c1 | |
| parent | f0cfce64b6a061ffeafeda254734f0b1f2f452fd (diff) | |
| download | otp-8846021fe1b1bcf79ec3a01037a8a656e161766c.tar.gz otp-8846021fe1b1bcf79ec3a01037a8a656e161766c.tar.bz2 otp-8846021fe1b1bcf79ec3a01037a8a656e161766c.zip | |
erts: Fix isfinite for windows
Add macro erts_isfinite as an OS independent way to check
if a float is finite.
| -rw-r--r-- | erts/emulator/beam/erl_nif.c | 2 | ||||
| -rw-r--r-- | erts/emulator/sys/ose/erl_ose_sys.h | 2 | ||||
| -rw-r--r-- | erts/emulator/sys/unix/erl_unix_sys.h | 2 | ||||
| -rw-r--r-- | erts/emulator/sys/win32/erl_win_sys.h | 2 |
4 files changed, 7 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_nif.c b/erts/emulator/beam/erl_nif.c index ec82ef251e..8b6cb880a3 100644 --- a/erts/emulator/beam/erl_nif.c +++ b/erts/emulator/beam/erl_nif.c @@ -967,7 +967,7 @@ ERL_NIF_TERM enif_make_uint64(ErlNifEnv* env, ErlNifUInt64 i) ERL_NIF_TERM enif_make_double(ErlNifEnv* env, double d) { Eterm* hp; - if (!isfinite(d)) + if (!erts_isfinite(d)) return enif_make_badarg(env); hp = alloc_heap(env,FLOAT_SIZE_OBJECT); FloatDef f; diff --git a/erts/emulator/sys/ose/erl_ose_sys.h b/erts/emulator/sys/ose/erl_ose_sys.h index cd66d95c26..f6526a4714 100644 --- a/erts/emulator/sys/ose/erl_ose_sys.h +++ b/erts/emulator/sys/ose/erl_ose_sys.h @@ -112,6 +112,8 @@ extern clock_t sys_times(SysTimes *buffer); /* No use in having other resolutions than 1 Ms. */ #define SYS_CLOCK_RESOLUTION 1 +#define erts_isfinite finite + #ifdef NO_FPE_SIGNALS #define erts_get_current_fp_exception() NULL diff --git a/erts/emulator/sys/unix/erl_unix_sys.h b/erts/emulator/sys/unix/erl_unix_sys.h index 26ed2fb558..dda50c486c 100644 --- a/erts/emulator/sys/unix/erl_unix_sys.h +++ b/erts/emulator/sys/unix/erl_unix_sys.h @@ -247,6 +247,8 @@ extern void sys_stop_cat(void); # define HAVE_ISFINITE #endif +#define erts_isfinite isfinite + #ifdef NO_FPE_SIGNALS #define erts_get_current_fp_exception() NULL diff --git a/erts/emulator/sys/win32/erl_win_sys.h b/erts/emulator/sys/win32/erl_win_sys.h index 838f0c61eb..905dcb6b69 100644 --- a/erts/emulator/sys/win32/erl_win_sys.h +++ b/erts/emulator/sys/win32/erl_win_sys.h @@ -207,6 +207,8 @@ extern volatile int erl_fp_exception; int _finite(double x); #endif +#define erts_isfinite _finite + /*#define NO_FPE_SIGNALS*/ #define erts_get_current_fp_exception() NULL #define __ERTS_FP_CHECK_INIT(fpexnp) do {} while (0) |