diff options
| author | John Högberg <[email protected]> | 2017-09-06 13:50:33 +0200 |
|---|---|---|
| committer | John Högberg <[email protected]> | 2017-09-06 13:50:33 +0200 |
| commit | 8c71ed08ea176713de8a6c15ca7616e1ef1be8a0 (patch) | |
| tree | 561464e723b066b6cba2e27f2b1c57cb55340365 /erts/preloaded/src/init.erl | |
| parent | 0cc04010ae73fcb591be4f35c00eb61b653cc0d0 (diff) | |
| parent | 5900bd977164eba24311bbf9995a4e313d4013a7 (diff) | |
| download | otp-8c71ed08ea176713de8a6c15ca7616e1ef1be8a0.tar.gz otp-8c71ed08ea176713de8a6c15ca7616e1ef1be8a0.tar.bz2 otp-8c71ed08ea176713de8a6c15ca7616e1ef1be8a0.zip | |
Merge branch 'maint' into john/erts/merge-zlib-and-vector-q
Diffstat (limited to 'erts/preloaded/src/init.erl')
| -rw-r--r-- | erts/preloaded/src/init.erl | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/erts/preloaded/src/init.erl b/erts/preloaded/src/init.erl index 1ccf8d599f..34a9f6b8b9 100644 --- a/erts/preloaded/src/init.erl +++ b/erts/preloaded/src/init.erl @@ -200,6 +200,8 @@ boot(BootArgs) -> register(init, self()), process_flag(trap_exit, true), + %% Load the zlib nif + zlib:on_load(), %% Load the tracer nif erl_tracer:on_load(), |