aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2016-02-25 11:07:18 +0100
committerHenrik Nord <[email protected]>2016-02-25 11:07:18 +0100
commit13411a7783355f9d2f40acd6859955e0f233a96e (patch)
treea4c2b2b503f3fdbe12e50505c5fdd63820e316b9
parent452164e469d804455a482bce7b00e94066f8762a (diff)
parent930996a0613b841a0d026100e5b4659d5269e80c (diff)
downloadotp-13411a7783355f9d2f40acd6859955e0f233a96e.tar.gz
otp-13411a7783355f9d2f40acd6859955e0f233a96e.tar.bz2
otp-13411a7783355f9d2f40acd6859955e0f233a96e.zip
Merge branch 'maint'
-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