aboutsummaryrefslogtreecommitdiffstats
path: root/erts/preloaded
diff options
context:
space:
mode:
authorZandra Hird <[email protected]>2015-03-17 09:07:34 +0100
committerZandra Hird <[email protected]>2015-03-17 09:08:06 +0100
commit29a1d1169f84c591c5d39175a1ad683449f0f727 (patch)
tree6e665aab9825e83634868248f71e0cef1335f67c /erts/preloaded
parentda0cfbabbae668bcacbf3e5fff1ebdc173e6f1e1 (diff)
parent7d82a632f4837764ac79dfb4986d102060bd3080 (diff)
downloadotp-29a1d1169f84c591c5d39175a1ad683449f0f727.tar.gz
otp-29a1d1169f84c591c5d39175a1ad683449f0f727.tar.bz2
otp-29a1d1169f84c591c5d39175a1ad683449f0f727.zip
Merge branch 'essen/zlib-windowbits'
* essen/zlib-windowbits: Update zlib:zwindowbits/0 type to accept 8 and -8 OTP-12564
Diffstat (limited to 'erts/preloaded')
-rw-r--r--erts/preloaded/src/zlib.erl6
1 files changed, 3 insertions, 3 deletions
diff --git a/erts/preloaded/src/zlib.erl b/erts/preloaded/src/zlib.erl
index 5ebc67dcaa..61dc642536 100644
--- a/erts/preloaded/src/zlib.erl
+++ b/erts/preloaded/src/zlib.erl
@@ -126,7 +126,7 @@
-type zlevel() :: 'none' | 'default' | 'best_compression' | 'best_speed'
| 0..9.
-type zmethod() :: 'deflated'.
--type zwindowbits() :: -15..-9 | 9..47.
+-type zwindowbits() :: -15..-8 | 8..47.
-type zmemlevel() :: 1..9.
-type zstrategy() :: 'default' | 'filtered' | 'huffman_only' | 'rle'.
@@ -531,8 +531,8 @@ arg_method(_) -> erlang:error(badarg).
-spec arg_bitsz(zwindowbits()) -> zwindowbits().
arg_bitsz(Bits) when is_integer(Bits) andalso
- ((8 < Bits andalso Bits < 48) orelse
- (-15 =< Bits andalso Bits < -8)) ->
+ ((8 =< Bits andalso Bits < 48) orelse
+ (-15 =< Bits andalso Bits =< -8)) ->
Bits;
arg_bitsz(_) -> erlang:error(badarg).