From: jsing <jsing@openbsd.org>
Date: Mon, 5 May 2014 16:16:37 +0000 (+0000)
Subject: Repair BIO_socket_nbio operation.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=eca31f833dd6cf0affae2b8bce87c98ebfc6d361;p=openbsd

Repair BIO_socket_nbio operation.

ok miod@
---

diff --git a/lib/libcrypto/bio/b_sock.c b/lib/libcrypto/bio/b_sock.c
index ecfaf93b99d..7da33d36b27 100644
--- a/lib/libcrypto/bio/b_sock.c
+++ b/lib/libcrypto/bio/b_sock.c
@@ -56,6 +56,8 @@
  * [including the GNU Public Licence.]
  */
 
+#include <sys/ioctl.h>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -575,8 +577,7 @@ BIO_socket_nbio(int s, int mode)
 	int l;
 
 	l = mode;
-#ifdef FIONBIO
 	ret = BIO_socket_ioctl(s, FIONBIO, &l);
-#endif
+
 	return (ret == 0);
 }
diff --git a/lib/libssl/src/crypto/bio/b_sock.c b/lib/libssl/src/crypto/bio/b_sock.c
index ecfaf93b99d..7da33d36b27 100644
--- a/lib/libssl/src/crypto/bio/b_sock.c
+++ b/lib/libssl/src/crypto/bio/b_sock.c
@@ -56,6 +56,8 @@
  * [including the GNU Public Licence.]
  */
 
+#include <sys/ioctl.h>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -575,8 +577,7 @@ BIO_socket_nbio(int s, int mode)
 	int l;
 
 	l = mode;
-#ifdef FIONBIO
 	ret = BIO_socket_ioctl(s, FIONBIO, &l);
-#endif
+
 	return (ret == 0);
 }