summaryrefslogtreecommitdiff
path: root/crypto/bio/bss_sock.c
diff options
context:
space:
mode:
authorlevitte <levitte>2010-01-27 11:10:46 +0000
committerlevitte <levitte>2010-01-27 11:10:46 +0000
commit61f7c8378a6ebcb13bca380f96286c342990e17b (patch)
tree40dfae68bee48b7cceb0281d9f8b1561c4473716 /crypto/bio/bss_sock.c
parent79594e374c833aa051142139404cb199383ff4b8 (diff)
downloadopenssl-61f7c8378a6ebcb13bca380f96286c342990e17b.tar.gz
Merge main -> VMS_64BITBRANCH_VMS_64BIT
Diffstat (limited to 'crypto/bio/bss_sock.c')
-rw-r--r--crypto/bio/bss_sock.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/crypto/bio/bss_sock.c b/crypto/bio/bss_sock.c
index a21358bc8..9bf5b3df0 100644
--- a/crypto/bio/bss_sock.c
+++ b/crypto/bio/bss_sock.c
@@ -61,6 +61,9 @@
#include <errno.h>
#define USE_SOCKETS
#include "cryptlib.h"
+
+#ifndef OPENSSL_NO_SOCK
+
#include <openssl/bio.h>
/* The following types are required to work in a 64-bit environment on
@@ -375,3 +378,5 @@ int BIO_sock_non_fatal_error(int err)
}
return(0);
}
+
+#endif /* #ifndef OPENSSL_NO_SOCK */