diff options
| author | Rickard Green <[email protected]> | 2015-03-25 15:35:03 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2015-03-25 15:35:03 +0100 |
| commit | c2fb3160dee9ad90783ad993c656177c7963d07c (patch) | |
| tree | 4338c2579b45cdd02bf294f88f5ab0cf8cfaa12e /erts/aclocal.m4 | |
| parent | d6797e9a34df677e82db5ee8b8388fbdf57f09f5 (diff) | |
| parent | 24cdb324390d99924af9f66104c0941afb5a7b08 (diff) | |
| download | otp-c2fb3160dee9ad90783ad993c656177c7963d07c.tar.gz otp-c2fb3160dee9ad90783ad993c656177c7963d07c.tar.bz2 otp-c2fb3160dee9ad90783ad993c656177c7963d07c.zip | |
Merge branch 'rickard/time_api/OTP-11997'
* rickard/time_api/OTP-11997:
Skip not updated test-cases
Fixes and cleanup
Diffstat (limited to 'erts/aclocal.m4')
| -rw-r--r-- | erts/aclocal.m4 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/erts/aclocal.m4 b/erts/aclocal.m4 index fb5ae4f02d..83f735d332 100644 --- a/erts/aclocal.m4 +++ b/erts/aclocal.m4 @@ -745,9 +745,9 @@ AC_DEFUN(ERL_MONOTONIC_CLOCK, done ]) - AC_CHECK_FUNCS([clock_getres gethrtime]) + AC_CHECK_FUNCS([clock_getres clock_get_attributes gethrtime]) - AC_CACHE_CHECK([for mach clock_get_time()], erl_cv_mach_clock_get_time_monotonic, + AC_CACHE_CHECK([for mach clock_get_time() with monotonic clock type], erl_cv_mach_clock_get_time_monotonic, [ AC_TRY_COMPILE([ #include <mach/clock.h> @@ -854,9 +854,9 @@ AC_DEFUN(ERL_WALL_CLOCK, done ]) - AC_CHECK_FUNCS([clock_getres gettimeofday]) + AC_CHECK_FUNCS([clock_getres clock_get_attributes gettimeofday]) - AC_CACHE_CHECK([for mach clock_get_time()], erl_cv_mach_clock_get_time_wall, + AC_CACHE_CHECK([for mach clock_get_time() with wall clock type], erl_cv_mach_clock_get_time_wall, [ AC_TRY_COMPILE([ #include <mach/clock.h> |