From: tedu <tedu@openbsd.org>
Date: Fri, 18 Apr 2014 21:41:15 +0000 (+0000)
Subject: unifdef NO_SOCK
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=1f76dd3efa69b060134da2941dee2d474accb82e;p=openbsd

unifdef NO_SOCK
---

diff --git a/lib/libcrypto/bio/b_sock.c b/lib/libcrypto/bio/b_sock.c
index 0baece8cdbd..a82c79a1b08 100644
--- a/lib/libcrypto/bio/b_sock.c
+++ b/lib/libcrypto/bio/b_sock.c
@@ -68,7 +68,6 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 
-#ifndef OPENSSL_NO_SOCK
 
 #include <openssl/dso.h>
 
@@ -599,4 +598,3 @@ BIO_socket_nbio(int s, int mode)
 #endif
 	return (ret == 0);
 }
-#endif
diff --git a/lib/libcrypto/bio/bss_acpt.c b/lib/libcrypto/bio/bss_acpt.c
index dab8a811e15..4ab5856ed6c 100644
--- a/lib/libcrypto/bio/bss_acpt.c
+++ b/lib/libcrypto/bio/bss_acpt.c
@@ -63,7 +63,6 @@
 #include <openssl/bio.h>
 #include <sys/socket.h>
 
-#ifndef OPENSSL_NO_SOCK
 
 #define SOCKET_PROTOCOL IPPROTO_TCP
 
@@ -460,4 +459,3 @@ BIO_new_accept(char *str)
 	}
 }
 
-#endif
diff --git a/lib/libcrypto/bio/bss_conn.c b/lib/libcrypto/bio/bss_conn.c
index 12cbed2ae92..fca5d5e853f 100644
--- a/lib/libcrypto/bio/bss_conn.c
+++ b/lib/libcrypto/bio/bss_conn.c
@@ -65,7 +65,6 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 
-#ifndef OPENSSL_NO_SOCK
 
 #define SOCKET_PROTOCOL IPPROTO_TCP
 
@@ -611,4 +610,3 @@ BIO_new_connect(char *str)
 	}
 }
 
-#endif
diff --git a/lib/libcrypto/bio/bss_sock.c b/lib/libcrypto/bio/bss_sock.c
index 0cba37f174f..3dae2562bf5 100644
--- a/lib/libcrypto/bio/bss_sock.c
+++ b/lib/libcrypto/bio/bss_sock.c
@@ -62,7 +62,6 @@
 #include "cryptlib.h"
 #include <sys/socket.h>
 
-#ifndef OPENSSL_NO_SOCK
 
 #include <openssl/bio.h>
 
@@ -240,4 +239,3 @@ BIO_sock_non_fatal_error(int err)
 	return (0);
 }
 
-#endif  /* #ifndef OPENSSL_NO_SOCK */
diff --git a/lib/libssl/src/crypto/bio/b_sock.c b/lib/libssl/src/crypto/bio/b_sock.c
index 0baece8cdbd..a82c79a1b08 100644
--- a/lib/libssl/src/crypto/bio/b_sock.c
+++ b/lib/libssl/src/crypto/bio/b_sock.c
@@ -68,7 +68,6 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 
-#ifndef OPENSSL_NO_SOCK
 
 #include <openssl/dso.h>
 
@@ -599,4 +598,3 @@ BIO_socket_nbio(int s, int mode)
 #endif
 	return (ret == 0);
 }
-#endif
diff --git a/lib/libssl/src/crypto/bio/bss_acpt.c b/lib/libssl/src/crypto/bio/bss_acpt.c
index dab8a811e15..4ab5856ed6c 100644
--- a/lib/libssl/src/crypto/bio/bss_acpt.c
+++ b/lib/libssl/src/crypto/bio/bss_acpt.c
@@ -63,7 +63,6 @@
 #include <openssl/bio.h>
 #include <sys/socket.h>
 
-#ifndef OPENSSL_NO_SOCK
 
 #define SOCKET_PROTOCOL IPPROTO_TCP
 
@@ -460,4 +459,3 @@ BIO_new_accept(char *str)
 	}
 }
 
-#endif
diff --git a/lib/libssl/src/crypto/bio/bss_conn.c b/lib/libssl/src/crypto/bio/bss_conn.c
index 12cbed2ae92..fca5d5e853f 100644
--- a/lib/libssl/src/crypto/bio/bss_conn.c
+++ b/lib/libssl/src/crypto/bio/bss_conn.c
@@ -65,7 +65,6 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 
-#ifndef OPENSSL_NO_SOCK
 
 #define SOCKET_PROTOCOL IPPROTO_TCP
 
@@ -611,4 +610,3 @@ BIO_new_connect(char *str)
 	}
 }
 
-#endif
diff --git a/lib/libssl/src/crypto/bio/bss_sock.c b/lib/libssl/src/crypto/bio/bss_sock.c
index 0cba37f174f..3dae2562bf5 100644
--- a/lib/libssl/src/crypto/bio/bss_sock.c
+++ b/lib/libssl/src/crypto/bio/bss_sock.c
@@ -62,7 +62,6 @@
 #include "cryptlib.h"
 #include <sys/socket.h>
 
-#ifndef OPENSSL_NO_SOCK
 
 #include <openssl/bio.h>
 
@@ -240,4 +239,3 @@ BIO_sock_non_fatal_error(int err)
 	return (0);
 }
 
-#endif  /* #ifndef OPENSSL_NO_SOCK */