diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2012-04-17 14:20:43 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2012-04-17 14:20:43 +0200 |
| commit | f21ff0941a68ef8bc1097537f4bb503a522a8bf3 (patch) | |
| tree | 9eb940dcf35c4a9a37b72135105c1b429bc5c902 /erts/preloaded | |
| parent | df3617da7bbd944435f4679b8f8e0b668cb0e9e1 (diff) | |
| parent | f7649b62e2c9b13d2d9a7c80d6a87f49781d069e (diff) | |
| download | otp-f21ff0941a68ef8bc1097537f4bb503a522a8bf3.tar.gz otp-f21ff0941a68ef8bc1097537f4bb503a522a8bf3.tar.bz2 otp-f21ff0941a68ef8bc1097537f4bb503a522a8bf3.zip | |
Merge branch 'egil/r16/inet-remove-bit8/OTP-10056'
* egil/r16/inet-remove-bit8/OTP-10056:
Update preloaded prim_inet.beam
erts: Remove bit8 option from prim_inet
kernel, erts: Remove bit8 option from inet
Diffstat (limited to 'erts/preloaded')
| -rw-r--r-- | erts/preloaded/ebin/prim_inet.beam | bin | 70100 -> 69896 bytes | |||
| -rw-r--r-- | erts/preloaded/src/prim_inet.erl | 7 |
2 files changed, 0 insertions, 7 deletions
diff --git a/erts/preloaded/ebin/prim_inet.beam b/erts/preloaded/ebin/prim_inet.beam Binary files differindex 49e6c71736..941ce02467 100644 --- a/erts/preloaded/ebin/prim_inet.beam +++ b/erts/preloaded/ebin/prim_inet.beam diff --git a/erts/preloaded/src/prim_inet.erl b/erts/preloaded/src/prim_inet.erl index 846ae97ed2..3c8a059269 100644 --- a/erts/preloaded/src/prim_inet.erl +++ b/erts/preloaded/src/prim_inet.erl @@ -1071,7 +1071,6 @@ enc_opt(deliver) -> ?INET_LOPT_DELIVER; enc_opt(exit_on_close) -> ?INET_LOPT_EXITONCLOSE; enc_opt(high_watermark) -> ?INET_LOPT_TCP_HIWTRMRK; enc_opt(low_watermark) -> ?INET_LOPT_TCP_LOWTRMRK; -enc_opt(bit8) -> ?INET_LOPT_BIT8; enc_opt(send_timeout) -> ?INET_LOPT_TCP_SEND_TIMEOUT; enc_opt(send_timeout_close) -> ?INET_LOPT_TCP_SEND_TIMEOUT_CLOSE; enc_opt(delay_send) -> ?INET_LOPT_TCP_DELAY_SEND; @@ -1125,7 +1124,6 @@ dec_opt(?INET_LOPT_DELIVER) -> deliver; dec_opt(?INET_LOPT_EXITONCLOSE) -> exit_on_close; dec_opt(?INET_LOPT_TCP_HIWTRMRK) -> high_watermark; dec_opt(?INET_LOPT_TCP_LOWTRMRK) -> low_watermark; -dec_opt(?INET_LOPT_BIT8) -> bit8; dec_opt(?INET_LOPT_TCP_SEND_TIMEOUT) -> send_timeout; dec_opt(?INET_LOPT_TCP_SEND_TIMEOUT_CLOSE) -> send_timeout_close; dec_opt(?INET_LOPT_TCP_DELAY_SEND) -> delay_send; @@ -1220,11 +1218,6 @@ type_opt_1(deliver) -> type_opt_1(exit_on_close) -> bool; type_opt_1(low_watermark) -> int; type_opt_1(high_watermark) -> int; -type_opt_1(bit8) -> - {enum,[{clear, ?INET_BIT8_CLEAR}, - {set, ?INET_BIT8_SET}, - {on, ?INET_BIT8_ON}, - {off, ?INET_BIT8_OFF}]}; type_opt_1(send_timeout) -> time; type_opt_1(send_timeout_close) -> bool; type_opt_1(delay_send) -> bool; |