diff options
| author | Hans Bolinder <[email protected]> | 2018-01-23 11:34:18 +0100 |
|---|---|---|
| committer | Hans Bolinder <[email protected]> | 2018-01-23 11:34:18 +0100 |
| commit | dc6a03a8351819a91c1e9235dd84df0acd4ba6b8 (patch) | |
| tree | 0dfd2c3c3cbf86656929d5a0e140f7825fc8d1dd /lib/stdlib/src/gen_event.erl | |
| parent | 7a37e39d45597a25ff532751c5131938b5286331 (diff) | |
| parent | 6deabadcda913b4fd7f3d209e4344f0b0f736e85 (diff) | |
| download | otp-dc6a03a8351819a91c1e9235dd84df0acd4ba6b8.tar.gz otp-dc6a03a8351819a91c1e9235dd84df0acd4ba6b8.tar.bz2 otp-dc6a03a8351819a91c1e9235dd84df0acd4ba6b8.zip | |
Merge branch 'hasse/kernel-stdlib/fix_contracts/OTP-14889' into maint
* hasse/kernel-stdlib/fix_contracts/OTP-14889:
kernel: Correct contracts and a bug in group_history
stdlib: Correct contracts
dialyzer: Optimize handling of a lot of warnings
Diffstat (limited to 'lib/stdlib/src/gen_event.erl')
| -rw-r--r-- | lib/stdlib/src/gen_event.erl | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/stdlib/src/gen_event.erl b/lib/stdlib/src/gen_event.erl index a9b98911e2..73e4457bd0 100644 --- a/lib/stdlib/src/gen_event.erl +++ b/lib/stdlib/src/gen_event.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1996-2017. All Rights Reserved. +%% Copyright Ericsson AB 1996-2018. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -125,7 +125,8 @@ | {'logfile', string()}. -type option() :: {'timeout', timeout()} | {'debug', [debug_flag()]} - | {'spawn_opt', [proc_lib:spawn_option()]}. + | {'spawn_opt', [proc_lib:spawn_option()]} + | {'hibernate_after', timeout()}. -type emgr_ref() :: atom() | {atom(), atom()} | {'global', atom()} | {'via', atom(), term()} | pid(). -type start_ret() :: {'ok', pid()} | {'error', term()}. |