aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/sys
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2017-09-05 14:40:33 +0200
committerRickard Green <[email protected]>2017-09-05 14:40:33 +0200
commit67f6114d3701dd38614acf520f13c07174a99d11 (patch)
treef0fa9d412359ba9ee3b8be2c098fc49bc72fc8f3 /erts/emulator/sys
parent60c836afbb7c993f3bd635e12c80f018aa017e3b (diff)
parent5a45d2917cd14bf5eab690453e8a191549de4c2c (diff)
downloadotp-67f6114d3701dd38614acf520f13c07174a99d11.tar.gz
otp-67f6114d3701dd38614acf520f13c07174a99d11.tar.bz2
otp-67f6114d3701dd38614acf520f13c07174a99d11.zip
Merge branch 'rickard/statistics-time-fixes/OTP-14597/ERL-465' into maint
* rickard/statistics-time-fixes/OTP-14597/ERL-465: Bug fixes of statistics(wall_clock) and statistics(runtime) Conflicts: erts/emulator/beam/erl_time_sup.c
Diffstat (limited to 'erts/emulator/sys')
-rw-r--r--erts/emulator/sys/unix/erl_unix_sys.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/erts/emulator/sys/unix/erl_unix_sys.h b/erts/emulator/sys/unix/erl_unix_sys.h
index 22059d21d5..b83837a7d2 100644
--- a/erts/emulator/sys/unix/erl_unix_sys.h
+++ b/erts/emulator/sys/unix/erl_unix_sys.h
@@ -86,6 +86,10 @@
#include <sys/times.h>
+#ifdef HAVE_SYS_RESOURCE_H
+# include <sys/resource.h>
+#endif
+
#ifdef HAVE_IEEEFP_H
#include <ieeefp.h>
#endif