diff options
| author | Hans Bolinder <[email protected]> | 2011-09-02 08:43:14 +0200 |
|---|---|---|
| committer | Hans Bolinder <[email protected]> | 2011-09-02 08:43:14 +0200 |
| commit | 1eac5476aa7faad600bb940ca3fe07be78273425 (patch) | |
| tree | c5d73b53f588503d3f872e413716b3a9b2e3c91b /lib/kernel/src | |
| parent | 8fc59a1ff776a472299db26b175da09a03b3d30b (diff) | |
| parent | bb94e589c8495caf7c1fa6ebe808f6983ceaf44a (diff) | |
| download | otp-1eac5476aa7faad600bb940ca3fe07be78273425.tar.gz otp-1eac5476aa7faad600bb940ca3fe07be78273425.tar.bz2 otp-1eac5476aa7faad600bb940ca3fe07be78273425.zip | |
Merge branch 'dev' into major
* dev:
Fix a couple of minor bugs with hook priority
Update to reflect addition of CTH priority addition
Update CTH priority default to be 0
Update to reflect new cth callback api
Update the return from init/2 to be {ok, NewState} or {ok,NewState,Priority} instead of NewState.
Add priority functionality and tests for ct hooks
Update internal hooks state to use a record instead of tuples
Improve and correct types and specifications in Kernel and STDLIB
Diffstat (limited to 'lib/kernel/src')
| -rw-r--r-- | lib/kernel/src/gen_sctp.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/kernel/src/gen_sctp.erl b/lib/kernel/src/gen_sctp.erl index c9a849eca7..6cebb7ab97 100644 --- a/lib/kernel/src/gen_sctp.erl +++ b/lib/kernel/src/gen_sctp.erl @@ -33,7 +33,7 @@ -export([error_string/1]). -export([controlling_process/2]). --opaque assoc_id() :: term(). +-type assoc_id() :: term(). -type option() :: {active, true | false | once} | {buffer, non_neg_integer()} | @@ -92,7 +92,7 @@ tos. -type sctp_socket() :: port(). --export_type([option/0, option_name/0]). +-export_type([assoc_id/0, option/0, option_name/0, sctp_socket/0]). -spec open() -> {ok, Socket} | {error, inet:posix()} when Socket :: sctp_socket(). |