diff options
| author | John Högberg <[email protected]> | 2017-09-06 12:54:50 +0200 |
|---|---|---|
| committer | John Högberg <[email protected]> | 2017-09-06 12:54:56 +0200 |
| commit | 5900bd977164eba24311bbf9995a4e313d4013a7 (patch) | |
| tree | 297589a2598bb3ae0381cd7e05d9b7be0c05e637 /erts/preloaded/src/init.erl | |
| parent | ad5d9eef3f41274f08008cdbb43afb2088d3276e (diff) | |
| parent | 2dc225ed172419066c8b3f54441ec14ffc2b0908 (diff) | |
| download | otp-5900bd977164eba24311bbf9995a4e313d4013a7.tar.gz otp-5900bd977164eba24311bbf9995a4e313d4013a7.tar.bz2 otp-5900bd977164eba24311bbf9995a4e313d4013a7.zip | |
Merge branch 'john/erts/zlib-nif/OTP-14185' into maint
OTP-14527
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(), |