diff options
| author | Rickard Green <[email protected]> | 2017-09-05 14:44:01 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2017-09-05 14:44:01 +0200 |
| commit | 4c27e0d703df7ee6786fba6d9e75c63d231a2b17 (patch) | |
| tree | f20ffa38df3cf5c8bad2306ec709bbc64b772a88 /erts/emulator/sys | |
| parent | 7636e282042f5ea1e8ffcd019ef2f4fae36c8fb7 (diff) | |
| parent | 67f6114d3701dd38614acf520f13c07174a99d11 (diff) | |
| download | otp-4c27e0d703df7ee6786fba6d9e75c63d231a2b17.tar.gz otp-4c27e0d703df7ee6786fba6d9e75c63d231a2b17.tar.bz2 otp-4c27e0d703df7ee6786fba6d9e75c63d231a2b17.zip | |
Merge branch 'maint'
* maint:
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.h | 4 |
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 cbbd0e6f40..b6f5b319ee 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 |