diff options
| author | Henrik Nord <[email protected]> | 2011-09-01 15:00:19 +0200 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2011-09-01 15:00:19 +0200 |
| commit | 7ca2941ca0ab85d904de658cf495318dcfbda760 (patch) | |
| tree | 8d6abc1263f8ce56d9baf17755b2523dac77a160 /lib/kernel/src | |
| parent | e813241e103aa74d4daf025564b259f3fb9aca5a (diff) | |
| parent | bf2d853857bb0e3a7fd5a2660b22b6e743f91f1c (diff) | |
| download | otp-7ca2941ca0ab85d904de658cf495318dcfbda760.tar.gz otp-7ca2941ca0ab85d904de658cf495318dcfbda760.tar.bz2 otp-7ca2941ca0ab85d904de658cf495318dcfbda760.zip | |
Merge branch 'dev' into major
Diffstat (limited to 'lib/kernel/src')
| -rw-r--r-- | lib/kernel/src/gen_tcp.erl | 2 | ||||
| -rw-r--r-- | lib/kernel/src/gen_udp.erl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/kernel/src/gen_tcp.erl b/lib/kernel/src/gen_tcp.erl index df326b59d6..8ab18c01b4 100644 --- a/lib/kernel/src/gen_tcp.erl +++ b/lib/kernel/src/gen_tcp.erl @@ -250,7 +250,7 @@ close(S) -> -spec send(Socket, Packet) -> ok | {error, Reason} when Socket :: socket(), - Packet :: string() | binary(), + Packet :: iodata(), Reason :: inet:posix(). send(S, Packet) when is_port(S) -> diff --git a/lib/kernel/src/gen_udp.erl b/lib/kernel/src/gen_udp.erl index 554f4ece4a..8688799ae9 100644 --- a/lib/kernel/src/gen_udp.erl +++ b/lib/kernel/src/gen_udp.erl @@ -109,7 +109,7 @@ close(S) -> Socket :: socket(), Address :: inet:ip_address() | inet:hostname(), Port :: inet:port_number(), - Packet :: string() | binary(), + Packet :: iodata(), Reason :: not_owner | inet:posix(). send(S, Address, Port, Packet) when is_port(S) -> |