diff options
| author | John Högberg <[email protected]> | 2017-10-25 08:52:04 +0200 |
|---|---|---|
| committer | John Högberg <[email protected]> | 2017-10-25 08:52:04 +0200 |
| commit | c26f0e58f440859abbfb9b4e3570713ac722e0da (patch) | |
| tree | 6bcbc29c8f4501c05a598262787ef06fb5a7666c /erts/preloaded/src | |
| parent | 541ee20b9eaefed7802f08cecddfbd12e5f3b516 (diff) | |
| parent | a98379d0519c28f9bc9b673ed2c09fb1ad52456e (diff) | |
| download | otp-c26f0e58f440859abbfb9b4e3570713ac722e0da.tar.gz otp-c26f0e58f440859abbfb9b4e3570713ac722e0da.tar.bz2 otp-c26f0e58f440859abbfb9b4e3570713ac722e0da.zip | |
Merge branch 'maint-20' into maint
* maint-20:
Updated OTP version
Update release notes
Update version numbers
erts: Fix so that bind correct schedulers
Update version
Fix error handling when decoding an AVP with an alternate dictionary
Remove unused function arguments
Fix faulty recursion
vsn -> 2.1.2
Update appup for ERIERL-14684
Fix speling error 'sndbuf' -> 'recbuf'
Add zlib:set_controlling_process/2
Diffstat (limited to 'erts/preloaded/src')
| -rw-r--r-- | erts/preloaded/src/zlib.erl | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/erts/preloaded/src/zlib.erl b/erts/preloaded/src/zlib.erl index 3170ab6351..03c9ae38a1 100644 --- a/erts/preloaded/src/zlib.erl +++ b/erts/preloaded/src/zlib.erl @@ -20,7 +20,8 @@ -module(zlib). --export([open/0,close/1,deflateInit/1,deflateInit/2,deflateInit/6, +-export([open/0,close/1,set_controlling_process/2, + deflateInit/1,deflateInit/2,deflateInit/6, deflateSetDictionary/2,deflateReset/1,deflateParams/3, deflate/2,deflate/3,deflateEnd/1, inflateInit/1,inflateInit/2,inflateInit/3, @@ -128,6 +129,14 @@ close(Z) -> close_nif(_Z) -> erlang:nif_error(undef). +-spec set_controlling_process(Z, Pid) -> 'ok' when + Z :: zstream(), + Pid :: pid(). +set_controlling_process(Z, Pid) -> + set_controller_nif(Z, Pid). +set_controller_nif(_Z, _Pid) -> + erlang:nif_error(undef). + -spec deflateInit(Z) -> 'ok' when Z :: zstream(). deflateInit(Z) -> |