diff options
| author | Micael Karlberg <[email protected]> | 2019-02-25 11:44:57 +0100 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2019-02-25 11:44:57 +0100 |
| commit | ae62af76cec483921b361396fb6ff042f72e3002 (patch) | |
| tree | e9f8ff24bb76c4fe76dc4718c66a61c34a42db93 /lib | |
| parent | 5045fe8660545754ab5ec6bb3cbcf3a8ff7d9697 (diff) | |
| parent | 8139aca79396e02eeb298d4d6fa2361c81649ce4 (diff) | |
| download | otp-ae62af76cec483921b361396fb6ff042f72e3002.tar.gz otp-ae62af76cec483921b361396fb6ff042f72e3002.tar.bz2 otp-ae62af76cec483921b361396fb6ff042f72e3002.zip | |
Merge branch 'bmk/20190225/systools/socket_and_net_preloaded/OTP-14831'
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/sasl/src/systools_make.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/sasl/src/systools_make.erl b/lib/sasl/src/systools_make.erl index 101701cec6..de4fc2d06c 100644 --- a/lib/sasl/src/systools_make.erl +++ b/lib/sasl/src/systools_make.erl @@ -1565,8 +1565,8 @@ preloaded() -> [atomics,counters,erl_init,erl_prim_loader,erl_tracer,erlang, erts_code_purger,erts_dirty_process_signal_handler, erts_internal,erts_literal_area_collector, - init,persistent_term,prim_buffer,prim_eval,prim_file, - prim_inet,prim_zip,zlib]. + init,net,persistent_term,prim_buffer,prim_eval,prim_file, + prim_inet,prim_zip,socket,zlib]. %%______________________________________________________________________ %% Kernel processes; processes that are specially treated by the init |