diff options
| author | Fredrik Gustafsson <[email protected]> | 2013-08-29 10:33:21 +0200 |
|---|---|---|
| committer | Fredrik Gustafsson <[email protected]> | 2013-08-29 10:33:21 +0200 |
| commit | 3bbfd3bd72601f7881115284ebf41bc25711a6d8 (patch) | |
| tree | 31c36f169618ea7deeb991d7efc837f14f8df183 /erts/preloaded | |
| parent | 676e6fe82571a666300f6ad2017d74f7bc1fe0e8 (diff) | |
| parent | 12f91cd369a9c7a24ede6c26935d93f82d4a050a (diff) | |
| download | otp-3bbfd3bd72601f7881115284ebf41bc25711a6d8.tar.gz otp-3bbfd3bd72601f7881115284ebf41bc25711a6d8.tar.bz2 otp-3bbfd3bd72601f7881115284ebf41bc25711a6d8.zip | |
Merge branch 'maint'
Conflicts:
erts/preloaded/ebin/zlib.beam
Diffstat (limited to 'erts/preloaded')
| -rw-r--r-- | erts/preloaded/ebin/zlib.beam | bin | 12788 -> 12828 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 feb3c5979e..690b90adb5 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 2c9d55f50c..3d85533b80 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). |