diff options
| author | Rickard Green <rickard@erlang.org> | 2021-06-18 13:23:18 +0200 |
|---|---|---|
| committer | Rickard Green <rickard@erlang.org> | 2021-06-18 13:23:18 +0200 |
| commit | 71c04d5d532206710a8ada591049adc321e4c1b4 (patch) | |
| tree | 42ee5abcb66063145d571471396b8e7d003d3765 | |
| parent | 7c6a3990dc43e89d3de8185c7a0aebad542fc8ef (diff) | |
| parent | c179130c691c7c61784ee0d9c3643100da4e466a (diff) | |
| download | erlang-71c04d5d532206710a8ada591049adc321e4c1b4.tar.gz | |
Merge branch 'rickard/monotonic-hrtime/OTP-17493' into rickard/monotonic-hrtime/22/OTP-17493
* rickard/monotonic-hrtime/OTP-17493:
Fix monotonic hrtime configure test
| -rw-r--r-- | erts/aclocal.m4 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/aclocal.m4 b/erts/aclocal.m4 index c5e9f66b1f..2a991b3a33 100644 --- a/erts/aclocal.m4 +++ b/erts/aclocal.m4 @@ -2531,7 +2531,7 @@ fi ERL_MONOTONIC_CLOCK(high_resolution, undefined, no) -case $$erl_monotonic_clock_low_resolution-$erl_monotonic_clock_func in +case $erl_monotonic_clock_low_resolution-$erl_monotonic_clock_func in no-mach_clock_get_time) monotonic_hrtime=yes AC_DEFINE(SYS_HRTIME_USING_MACH_CLOCK_GET_TIME, [1], [Define if you want to implement erts_os_hrtime() using mach clock_get_time()]) |