diff options
| author | Fredrik Gustafsson <[email protected]> | 2013-08-29 10:19:02 +0200 |
|---|---|---|
| committer | Fredrik Gustafsson <[email protected]> | 2013-08-29 10:19:02 +0200 |
| commit | 12f91cd369a9c7a24ede6c26935d93f82d4a050a (patch) | |
| tree | aff9545af99e15b41986b29ddb0bb08b00439e7a | |
| parent | 6fc94ba0b93488e46429dd4e71d11ebfe3b62792 (diff) | |
| parent | e0f448d5dcbfed90023203ef9cd96768460eec60 (diff) | |
| download | otp-12f91cd369a9c7a24ede6c26935d93f82d4a050a.tar.gz otp-12f91cd369a9c7a24ede6c26935d93f82d4a050a.tar.bz2 otp-12f91cd369a9c7a24ede6c26935d93f82d4a050a.zip | |
Merge branch 'essen/export-zlib-zstream/OTP-11278' into maint
* essen/export-zlib-zstream/OTP-11278:
Updated preloaded
Export type zlib:zstream/0
| -rw-r--r-- | erts/preloaded/ebin/zlib.beam | bin | 12784 -> 12812 bytes | |||
| -rw-r--r-- | erts/preloaded/src/zlib.erl | 2 |
2 files changed, 2 insertions, 0 deletions
diff --git a/erts/preloaded/ebin/zlib.beam b/erts/preloaded/ebin/zlib.beam Binary files differindex 35e4d963fd..75af019783 100644 --- a/erts/preloaded/ebin/zlib.beam +++ b/erts/preloaded/ebin/zlib.beam diff --git a/erts/preloaded/src/zlib.erl b/erts/preloaded/src/zlib.erl index 1faae1c1f4..54391bd945 100644 --- a/erts/preloaded/src/zlib.erl +++ b/erts/preloaded/src/zlib.erl @@ -30,6 +30,8 @@ compress/1,uncompress/1,zip/1,unzip/1, gzip/1,gunzip/1]). +-export_type([zstream/0]). + %% flush argument encoding -define(Z_NO_FLUSH, 0). -define(Z_SYNC_FLUSH, 2). |