diff options
author | djm <> | 2012-10-13 21:23:58 +0000 |
---|---|---|
committer | djm <> | 2012-10-13 21:23:58 +0000 |
commit | eb9e590d2bbc1d57aee9aee0fe94c001fb27e697 (patch) | |
tree | cfb338ea736543eb88bd6c3f56f007ecb05dce51 /src/lib/libssl/src/crypto/bio/b_sock.c | |
parent | dd489e85d1735eb58774a1c57c6f586cede35b5d (diff) | |
download | openbsd-eb9e590d2bbc1d57aee9aee0fe94c001fb27e697.tar.gz openbsd-eb9e590d2bbc1d57aee9aee0fe94c001fb27e697.tar.bz2 openbsd-eb9e590d2bbc1d57aee9aee0fe94c001fb27e697.zip |
import OpenSSL-1.0.1c
Diffstat (limited to 'src/lib/libssl/src/crypto/bio/b_sock.c')
-rw-r--r-- | src/lib/libssl/src/crypto/bio/b_sock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/libssl/src/crypto/bio/b_sock.c b/src/lib/libssl/src/crypto/bio/b_sock.c index d47310d650..41f958be71 100644 --- a/src/lib/libssl/src/crypto/bio/b_sock.c +++ b/src/lib/libssl/src/crypto/bio/b_sock.c | |||
@@ -960,7 +960,6 @@ int BIO_set_tcp_ndelay(int s, int on) | |||
960 | #endif | 960 | #endif |
961 | return(ret == 0); | 961 | return(ret == 0); |
962 | } | 962 | } |
963 | #endif | ||
964 | 963 | ||
965 | int BIO_socket_nbio(int s, int mode) | 964 | int BIO_socket_nbio(int s, int mode) |
966 | { | 965 | { |
@@ -973,3 +972,4 @@ int BIO_socket_nbio(int s, int mode) | |||
973 | #endif | 972 | #endif |
974 | return(ret == 0); | 973 | return(ret == 0); |
975 | } | 974 | } |
975 | #endif | ||