diff options
| author | simon <simon@FreeBSD.org> | 2009-06-14 19:45:16 +0000 |
|---|---|---|
| committer | simon <simon@FreeBSD.org> | 2009-06-14 19:45:16 +0000 |
| commit | 5fb395764b4b691c877e526b4e65bbedb5cb67c7 (patch) | |
| tree | 90cf0e59374e08e88c1514f35c4b2aab0cccd66d /crypto/openssl/crypto/bio/bss_sock.c | |
| parent | 07b720e0fe4141d966e129428ee8eb96f394787f (diff) | |
| parent | d5528ae65fadeed6bcb5c766bf12ed4b275a9271 (diff) | |
| download | FreeBSD-src-5fb395764b4b691c877e526b4e65bbedb5cb67c7.zip FreeBSD-src-5fb395764b4b691c877e526b4e65bbedb5cb67c7.tar.gz | |
Merge OpenSSL 0.9.8k into head.
Approved by: re
Diffstat (limited to 'crypto/openssl/crypto/bio/bss_sock.c')
| -rw-r--r-- | crypto/openssl/crypto/bio/bss_sock.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/crypto/openssl/crypto/bio/bss_sock.c b/crypto/openssl/crypto/bio/bss_sock.c index 472dd75..30c3cea 100644 --- a/crypto/openssl/crypto/bio/bss_sock.c +++ b/crypto/openssl/crypto/bio/bss_sock.c @@ -60,6 +60,9 @@ #include <errno.h> #define USE_SOCKETS #include "cryptlib.h" + +#ifndef OPENSSL_NO_SOCK + #include <openssl/bio.h> #ifdef WATT32 @@ -300,3 +303,5 @@ int BIO_sock_non_fatal_error(int err) } return(0); } + +#endif /* #ifndef OPENSSL_NO_SOCK */ |
