diff options
| author | djm <> | 2012-10-13 21:25:14 +0000 |
|---|---|---|
| committer | djm <> | 2012-10-13 21:25:14 +0000 |
| commit | 942650cdef05a877200cb7aff3a075935a5fd0cd (patch) | |
| tree | 281e0a29ae8f87a8c47fbd4deaa1f3d48b8cc5c1 /src/lib/libcrypto/bio/b_sock.c | |
| parent | 37f091539f73e1650c83acd0c78677ef48c209a6 (diff) | |
| download | openbsd-942650cdef05a877200cb7aff3a075935a5fd0cd.tar.gz openbsd-942650cdef05a877200cb7aff3a075935a5fd0cd.tar.bz2 openbsd-942650cdef05a877200cb7aff3a075935a5fd0cd.zip | |
resolve conflicts
Diffstat (limited to 'src/lib/libcrypto/bio/b_sock.c')
| -rw-r--r-- | src/lib/libcrypto/bio/b_sock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/libcrypto/bio/b_sock.c b/src/lib/libcrypto/bio/b_sock.c index d47310d650..41f958be71 100644 --- a/src/lib/libcrypto/bio/b_sock.c +++ b/src/lib/libcrypto/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 | ||