From 31e20c22435e430c3fb2a09505934f064c71fbd7 Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Tue, 8 Jul 2014 11:05:41 +0000
Subject: We have EAI_FAMILY - remove the #ifdefs.

ok beck@
---
 src/lib/libcrypto/bio/b_sock.c         | 6 +-----
 src/lib/libssl/src/crypto/bio/b_sock.c | 6 +-----
 2 files changed, 2 insertions(+), 10 deletions(-)

(limited to 'src/lib')

diff --git a/src/lib/libcrypto/bio/b_sock.c b/src/lib/libcrypto/bio/b_sock.c
index 8fea0b7f8f..ad261f065a 100644
--- a/src/lib/libcrypto/bio/b_sock.c
+++ b/src/lib/libcrypto/bio/b_sock.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: b_sock.c,v 1.46 2014/07/08 10:12:48 jsing Exp $ */
+/* $OpenBSD: b_sock.c,v 1.47 2014/07/08 11:05:41 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -247,7 +247,6 @@ BIO_get_accept_socket(char *host, int bind_mode)
 	else
 		p = h, h = NULL;
 
-#ifdef EAI_FAMILY
 	do {
 		struct addrinfo *res, hint;
 
@@ -280,7 +279,6 @@ BIO_get_accept_socket(char *host, int bind_mode)
 		freeaddrinfo(res);
 		goto again;
 	} while (0);
-#endif
 
 	if (!BIO_get_port(p, &port))
 		goto err;
@@ -407,7 +405,6 @@ BIO_accept(int sock, char **addr)
 	if (addr == NULL)
 		goto end;
 
-#ifdef EAI_FAMILY
 	do {
 		char   h[NI_MAXHOST], s[NI_MAXSERV];
 		size_t nl;
@@ -441,7 +438,6 @@ BIO_accept(int sock, char **addr)
 		snprintf(*addr, nl, "%s:%s", h, s);
 		goto end;
 	} while (0);
-#endif
 	if (sa.from.sa.sa_family != AF_INET)
 		goto end;
 	l = ntohl(sa.from.sa_in.sin_addr.s_addr);
diff --git a/src/lib/libssl/src/crypto/bio/b_sock.c b/src/lib/libssl/src/crypto/bio/b_sock.c
index 8fea0b7f8f..ad261f065a 100644
--- a/src/lib/libssl/src/crypto/bio/b_sock.c
+++ b/src/lib/libssl/src/crypto/bio/b_sock.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: b_sock.c,v 1.46 2014/07/08 10:12:48 jsing Exp $ */
+/* $OpenBSD: b_sock.c,v 1.47 2014/07/08 11:05:41 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -247,7 +247,6 @@ BIO_get_accept_socket(char *host, int bind_mode)
 	else
 		p = h, h = NULL;
 
-#ifdef EAI_FAMILY
 	do {
 		struct addrinfo *res, hint;
 
@@ -280,7 +279,6 @@ BIO_get_accept_socket(char *host, int bind_mode)
 		freeaddrinfo(res);
 		goto again;
 	} while (0);
-#endif
 
 	if (!BIO_get_port(p, &port))
 		goto err;
@@ -407,7 +405,6 @@ BIO_accept(int sock, char **addr)
 	if (addr == NULL)
 		goto end;
 
-#ifdef EAI_FAMILY
 	do {
 		char   h[NI_MAXHOST], s[NI_MAXSERV];
 		size_t nl;
@@ -441,7 +438,6 @@ BIO_accept(int sock, char **addr)
 		snprintf(*addr, nl, "%s:%s", h, s);
 		goto end;
 	} while (0);
-#endif
 	if (sa.from.sa.sa_family != AF_INET)
 		goto end;
 	l = ntohl(sa.from.sa_in.sin_addr.s_addr);
-- 
cgit v1.2.3-55-g6feb