aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2014-12-02 10:24:44 +0100
committerLukas Larsson <[email protected]>2014-12-02 10:24:44 +0100
commit74273fe830e63dd58b82e6931cc1f538ffc3db42 (patch)
treea6990abbff36f79bb926ebd90f01d859f6ad0a7b
parentda2f55033549878a2cfe19067c210f1d3cc113ce (diff)
parenta2ca3b6efd40d0f313d8dac1e7161f32182cd875 (diff)
downloadotp-74273fe830e63dd58b82e6931cc1f538ffc3db42.tar.gz
otp-74273fe830e63dd58b82e6931cc1f538ffc3db42.tar.bz2
otp-74273fe830e63dd58b82e6931cc1f538ffc3db42.zip
Merge branch 'maint'
* maint: erts: Fix finite warning for clang
-rw-r--r--erts/emulator/sys/unix/erl_unix_sys.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/sys/unix/erl_unix_sys.h b/erts/emulator/sys/unix/erl_unix_sys.h
index f7a6298d5b..26ed2fb558 100644
--- a/erts/emulator/sys/unix/erl_unix_sys.h
+++ b/erts/emulator/sys/unix/erl_unix_sys.h
@@ -229,7 +229,7 @@ extern void sys_stop_cat(void);
#ifdef USE_ISINF_ISNAN /* simulate finite() */
# define isfinite(f) (!isinf(f) && !isnan(f))
# define HAVE_ISFINITE
-#elif defined(__GNUC__) && defined(HAVE_FINITE)
+#elif (defined(__GNUC__) && !defined(__llvm__)) && defined(HAVE_FINITE)
/* We use finite in gcc as it emits assembler instead of
the function call that isfinite emits. The assembler is
significantly faster. */