summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Unangst <tedu@cvs.openbsd.org>2014-04-18 21:41:16 +0000
committerTed Unangst <tedu@cvs.openbsd.org>2014-04-18 21:41:16 +0000
commit9999a30c5e8d41836a8d8987690be1953a8b1ba6 (patch)
treec812aa4d3a1a19662c6b617aaa615e8e58d2daeb
parent28e2c37404537961c56b16f23ce551c940d58e09 (diff)
unifdef NO_SOCK
-rw-r--r--lib/libcrypto/bio/b_sock.c2
-rw-r--r--lib/libcrypto/bio/bss_acpt.c2
-rw-r--r--lib/libcrypto/bio/bss_conn.c2
-rw-r--r--lib/libcrypto/bio/bss_sock.c2
4 files changed, 0 insertions, 8 deletions
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 */