diff options
| author | Micael Karlberg <[email protected]> | 2019-05-23 16:30:28 +0200 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2019-05-23 16:30:28 +0200 |
| commit | 4c98fb441dc1e1b9ff8f99d80cf3145a8c6d8704 (patch) | |
| tree | 3927c7856f08d46a5030b74a6ae8616c6631a1b2 /erts/emulator/nifs/common | |
| parent | db4c234f442f43a0160dee71d9ca02c08c353ae9 (diff) | |
| parent | 3dc31d6ad7bafd43ce5a7a6d95cec7b4c9e808c7 (diff) | |
| download | otp-4c98fb441dc1e1b9ff8f99d80cf3145a8c6d8704.tar.gz otp-4c98fb441dc1e1b9ff8f99d80cf3145a8c6d8704.tar.bz2 otp-4c98fb441dc1e1b9ff8f99d80cf3145a8c6d8704.zip | |
Merge branch 'bmk/erts/esock/20190517/nsupports_options_tcp_invalid_flags/OTP-15827' into maint
Diffstat (limited to 'erts/emulator/nifs/common')
| -rw-r--r-- | erts/emulator/nifs/common/socket_nif.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/nifs/common/socket_nif.c b/erts/emulator/nifs/common/socket_nif.c index 1298ae4dba..e71c786d3e 100644 --- a/erts/emulator/nifs/common/socket_nif.c +++ b/erts/emulator/nifs/common/socket_nif.c @@ -4004,7 +4004,7 @@ ERL_NIF_TERM nsupports_options_tcp(ErlNifEnv* env) /* *** SOCKET_OPT_TCP_MAXSEG => TCP_MAXSEG *** */ -#if defined(TCP_) +#if defined(TCP_MAXSEG) tmp = MKT2(env, esock_atom_maxseg, esock_atom_true); #else tmp = MKT2(env, esock_atom_maxseg, esock_atom_false); @@ -4018,7 +4018,7 @@ ERL_NIF_TERM nsupports_options_tcp(ErlNifEnv* env) /* *** SOCKET_OPT_TCP_NODELAY => TCP_NODELAY *** */ -#if defined(TCP_) +#if defined(TCP_NODELAY) tmp = MKT2(env, esock_atom_nodelay, esock_atom_true); #else tmp = MKT2(env, esock_atom_nodelay, esock_atom_false); |