From ee26f086217016f09154412b171ad62a33a346f6 Mon Sep 17 00:00:00 2001
From: djm <>
Date: Mon, 6 Apr 2009 06:33:20 +0000
Subject: resolve conflicts

---
 src/lib/libcrypto/bio/bss_sock.c | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src/lib/libcrypto/bio/bss_sock.c')

diff --git a/src/lib/libcrypto/bio/bss_sock.c b/src/lib/libcrypto/bio/bss_sock.c
index 472dd75821..30c3ceab46 100644
--- a/src/lib/libcrypto/bio/bss_sock.c
+++ b/src/lib/libcrypto/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 */
-- 
cgit v1.2.3-55-g6feb