aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2016-02-25 11:06:47 +0100
committerHenrik Nord <[email protected]>2016-02-25 11:06:47 +0100
commit930996a0613b841a0d026100e5b4659d5269e80c (patch)
tree954374ac0d1d08db696635d03a284ff4bf06b3ee /lib/kernel
parent41c4e07f11e17370f15995c346c146e68ff5a247 (diff)
parent18ab537a26997c2c825f4b15db21c5160106d96e (diff)
downloadotp-930996a0613b841a0d026100e5b4659d5269e80c.tar.gz
otp-930996a0613b841a0d026100e5b4659d5269e80c.tar.bz2
otp-930996a0613b841a0d026100e5b4659d5269e80c.zip
Merge branch 'bernardd/gen_tcp_export_socket' into maint
* bernardd/gen_tcp_export_socket: Export gen_tcp:socket() type OTP-13380
Diffstat (limited to 'lib/kernel')
-rw-r--r--lib/kernel/src/gen_tcp.erl3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/kernel/src/gen_tcp.erl b/lib/kernel/src/gen_tcp.erl
index d7dba4ac80..8cb2a725e8 100644
--- a/lib/kernel/src/gen_tcp.erl
+++ b/lib/kernel/src/gen_tcp.erl
@@ -114,7 +114,8 @@
option().
-type socket() :: port().
--export_type([option/0, option_name/0, connect_option/0, listen_option/0]).
+-export_type([option/0, option_name/0, connect_option/0, listen_option/0,
+ socket/0]).
%%
%% Connect a socket