diff options
| author | Rickard Green <[email protected]> | 2015-09-09 18:16:04 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2015-09-09 18:16:04 +0200 |
| commit | fff7daa154a1b96b3e11d74bd2d60fc3a41aa832 (patch) | |
| tree | 4c7213260ecc92a0f4ab34c1129fef478872f029 /erts/aclocal.m4 | |
| parent | 59911612aec5f18b099dbc518089dd3ce48fdd97 (diff) | |
| parent | 5a02ed2f3505f5ed3282c6b43963e19e63e49905 (diff) | |
| download | otp-fff7daa154a1b96b3e11d74bd2d60fc3a41aa832.tar.gz otp-fff7daa154a1b96b3e11d74bd2d60fc3a41aa832.tar.bz2 otp-fff7daa154a1b96b3e11d74bd2d60fc3a41aa832.zip | |
Merge branch 'rickard/event-tmo/OTP-12954' into maint
* rickard/event-tmo/OTP-12954:
Fix ethread events with timeout
Diffstat (limited to 'erts/aclocal.m4')
| -rw-r--r-- | erts/aclocal.m4 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/erts/aclocal.m4 b/erts/aclocal.m4 index 11c311f2c0..34e7376229 100644 --- a/erts/aclocal.m4 +++ b/erts/aclocal.m4 @@ -750,8 +750,8 @@ AC_DEFUN(ERL_MONOTONIC_CLOCK, prefer_resolution_clock_gettime_monotonic="$2" ;; *) - check_msg="" - prefer_resolution_clock_gettime_monotonic= + check_msg="custom " + prefer_resolution_clock_gettime_monotonic="$2" ;; esac @@ -1472,7 +1472,7 @@ AC_ARG_WITH(with_sparc_memory_order, LM_CHECK_THR_LIB ERL_INTERNAL_LIBS -ERL_MONOTONIC_CLOCK(high_resolution, undefined, no) +ERL_MONOTONIC_CLOCK(try_find_pthread_compatible, CLOCK_HIGHRES CLOCK_MONOTONIC, no) case $erl_monotonic_clock_func in clock_gettime) |