diff options
| author | Lukas Larsson <[email protected]> | 2014-10-28 11:43:07 +0100 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2014-10-28 11:43:07 +0100 |
| commit | d1d6a655545ddf3c088bf06f3f8636a5cf3b9fe2 (patch) | |
| tree | 851b4d7d399e29796b58a139c2907b55fead5541 /erts/emulator/sys | |
| parent | 7d08338b0742fd4b24cdd87ee9f098ec09fcecea (diff) | |
| parent | 3a4433d67cb2f14c5ed69e8eae7b772eebcaa30b (diff) | |
| download | otp-d1d6a655545ddf3c088bf06f3f8636a5cf3b9fe2.tar.gz otp-d1d6a655545ddf3c088bf06f3f8636a5cf3b9fe2.tar.bz2 otp-d1d6a655545ddf3c088bf06f3f8636a5cf3b9fe2.zip | |
Merge branch 'maint'
* maint:
Use isfinite() instead of finite() when available
Diffstat (limited to 'erts/emulator/sys')
| -rw-r--r-- | erts/emulator/sys/unix/erl_unix_sys.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/erts/emulator/sys/unix/erl_unix_sys.h b/erts/emulator/sys/unix/erl_unix_sys.h index b2fe34c1ac..c3dba69acb 100644 --- a/erts/emulator/sys/unix/erl_unix_sys.h +++ b/erts/emulator/sys/unix/erl_unix_sys.h @@ -227,8 +227,13 @@ extern void sys_stop_cat(void); */ #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 @@ -238,7 +243,7 @@ extern void sys_stop_cat(void); #define erts_thread_init_fp_exception() do{}while(0) #endif # define __ERTS_FP_CHECK_INIT(fpexnp) do {} while (0) -# define __ERTS_FP_ERROR(fpexnp, f, Action) if (!finite(f)) { Action; } else {} +# define __ERTS_FP_ERROR(fpexnp, f, Action) if (!isfinite(f)) { Action; } else {} # define __ERTS_FP_ERROR_THOROUGH(fpexnp, f, Action) __ERTS_FP_ERROR(fpexnp, f, Action) # define __ERTS_SAVE_FP_EXCEPTION(fpexnp) # define __ERTS_RESTORE_FP_EXCEPTION(fpexnp) @@ -302,7 +307,7 @@ static __inline__ void __ERTS_FP_CHECK_INIT(volatile unsigned long *fp_exception code to always throw floating-point exceptions on errors. */ static __inline__ int erts_check_fpe_thorough(volatile unsigned long *fp_exception, double f) { - return erts_check_fpe(fp_exception, f) || !finite(f); + return erts_check_fpe(fp_exception, f) || !isfinite(f); } # define __ERTS_FP_ERROR_THOROUGH(fpexnp, f, Action) \ do { if (erts_check_fpe_thorough((fpexnp),(f))) { Action; } } while (0) |