aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel/src
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2012-01-25 14:51:00 +0100
committerMicael Karlberg <[email protected]>2012-01-25 14:51:00 +0100
commita0e8f2621a39ca8e032b8ec30164207de1d7c26e (patch)
tree2bc886b715b73d5f206fd11760f1306ee88a12c9 /lib/kernel/src
parent1690855b42587ac7aab02b89986adb46e69dac35 (diff)
parent1436244c50e214c3de656c52022881bc8a27ca37 (diff)
downloadotp-a0e8f2621a39ca8e032b8ec30164207de1d7c26e.tar.gz
otp-a0e8f2621a39ca8e032b8ec30164207de1d7c26e.tar.bz2
otp-a0e8f2621a39ca8e032b8ec30164207de1d7c26e.zip
Merge branch 'master' of super:otp
Diffstat (limited to 'lib/kernel/src')
-rw-r--r--lib/kernel/src/gen_sctp.erl6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/kernel/src/gen_sctp.erl b/lib/kernel/src/gen_sctp.erl
index 77ca26b845..d8954f0cf7 100644
--- a/lib/kernel/src/gen_sctp.erl
+++ b/lib/kernel/src/gen_sctp.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2007-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2012. All Rights Reserved.
%%
%% The contents of this file are subject to the Erlang Public License,
%% Version 1.1, (the "License"); you may not use this file except in
@@ -314,7 +314,7 @@ eof_or_abort(S, AssocId, Action) ->
-spec send(Socket, SndRcvInfo, Data) -> ok | {error, Reason} when
Socket :: sctp_socket(),
SndRcvInfo :: #sctp_sndrcvinfo{},
- Data :: binary | iolist(),
+ Data :: binary() | iolist(),
Reason :: term().
%% Full-featured send. Rarely needed.
@@ -331,7 +331,7 @@ send(S, SRI, Data) ->
Socket :: sctp_socket(),
Assoc :: #sctp_assoc_change{} | assoc_id(),
Stream :: integer(),
- Data :: binary | iolist(),
+ Data :: binary() | iolist(),
Reason :: term().
send(S, #sctp_assoc_change{assoc_id=AssocId}, Stream, Data)