diff options
author | Ingela Anderton Andin <[email protected]> | 2015-10-26 09:12:35 +0100 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2015-10-26 09:12:35 +0100 |
commit | abb62a6d1918bc46ada942ae4f4c79caf2690d86 (patch) | |
tree | 902cf0d0840c896e8dc7df7ab26bf2e284fc39cc /lib/kernel/src/inet_int.hrl | |
parent | a76cc1d337c0bf44ecefebeccac2d08e496ba7e8 (diff) | |
parent | 235bf943d762bfdb5638d23b3270f92c50050b0a (diff) | |
download | otp-abb62a6d1918bc46ada942ae4f4c79caf2690d86.tar.gz otp-abb62a6d1918bc46ada942ae4f4c79caf2690d86.tar.bz2 otp-abb62a6d1918bc46ada942ae4f4c79caf2690d86.zip |
Merge branch 'ia/pr/758/OTP-12837' into maint
* ia/pr/758/OTP-12837:
erts: Include test in group so that it is run
erts: Clarify documentation
erts: Add {line_delimiter, byte()} option to inet:setopts/2
Diffstat (limited to 'lib/kernel/src/inet_int.hrl')
-rw-r--r-- | lib/kernel/src/inet_int.hrl | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/kernel/src/inet_int.hrl b/lib/kernel/src/inet_int.hrl index bfe4c9ec8c..e7c6cf8ae2 100644 --- a/lib/kernel/src/inet_int.hrl +++ b/lib/kernel/src/inet_int.hrl @@ -149,6 +149,7 @@ -define(INET_LOPT_MSGQ_LOWTRMRK, 37). -define(INET_LOPT_NETNS, 38). -define(INET_LOPT_TCP_SHOW_ECONNRESET, 39). +-define(INET_LOPT_LINE_DELIM, 40). % Specific SCTP options: separate range: -define(SCTP_OPT_RTOINFO, 100). -define(SCTP_OPT_ASSOCINFO, 101). |