diff options
author | Lukas Larsson <[email protected]> | 2014-12-12 15:34:52 +0100 |
---|---|---|
committer | Lukas Larsson <[email protected]> | 2014-12-12 15:34:52 +0100 |
commit | d5b67726739befc7d0ab9a9282494ae1c28903d7 (patch) | |
tree | fb2fa29fd1611ef395626342b85b81e6181df547 /erts/emulator/beam/erl_time.h | |
parent | 1b6f362e555e508d3d40d907b10061e457deafb5 (diff) | |
parent | 6e3057ddddb77835664f5264a7da62452dc3d9c1 (diff) | |
download | otp-d5b67726739befc7d0ab9a9282494ae1c28903d7.tar.gz otp-d5b67726739befc7d0ab9a9282494ae1c28903d7.tar.bz2 otp-d5b67726739befc7d0ab9a9282494ae1c28903d7.zip |
Merge branch 'lukas/erts/cpu_timestamp_linux/OTP-12366'
* lukas/erts/cpu_timestamp_linux/OTP-12366:
erts: Allow cpu_timestamp tracing for Linux
Diffstat (limited to 'erts/emulator/beam/erl_time.h')
-rw-r--r-- | erts/emulator/beam/erl_time.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_time.h b/erts/emulator/beam/erl_time.h index 4bbdcaa3e3..7ed1a395ad 100644 --- a/erts/emulator/beam/erl_time.h +++ b/erts/emulator/beam/erl_time.h @@ -107,7 +107,7 @@ ERTS_GLB_INLINE void erts_do_time_add(erts_short_time_t elapsed) /* time_sup */ -#if (defined(HAVE_GETHRVTIME) || defined(HAVE_CLOCK_GETTIME)) +#if (defined(HAVE_GETHRVTIME) || defined(HAVE_CLOCK_GETTIME_CPU_TIME)) # ifndef HAVE_ERTS_NOW_CPU # define HAVE_ERTS_NOW_CPU # ifdef HAVE_GETHRVTIME |