From: Dennis Stosberg <dennis@stosberg.net>
Date: Tue, 15 Aug 2006 09:01:25 +0000 (+0200)
Subject: Look for sockaddr_storage in sys/socket.h
X-Git-Tag: v1.4.3-rc1~236
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ab5573ae9f4178a7b6f6920f04c73a65feb3c690;p=git.git

Look for sockaddr_storage in sys/socket.h

On Solaris and the BSDs the definition of "struct sockaddr_storage"
is not available from "netinet/in.h".  On Solaris "sys/socket.h" is
enough, at least OpenBSD needs "sys/types.h", too.

Using "sys/types.h" and "sys/socket.h" seems to be a more portable
way.

Signed-off-by: Dennis Stosberg <dennis@stosberg.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/configure.ac b/configure.ac
index e890131c4..0321d437d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -181,8 +181,10 @@ AC_SUBST(NO_D_TYPE_IN_DIRENT)
 # sockaddr_storage.
 AC_CHECK_TYPE(struct sockaddr_storage,
 [NO_SOCKADDR_STORAGE=],
-[NO_SOCKADDR_STORAGE=YesPlease],
-[#include <netinet/in.h>])
+[NO_SOCKADDR_STORAGE=YesPlease],[
+#include <sys/types.h>
+#include <sys/socket.h>
+])
 AC_SUBST(NO_SOCKADDR_STORAGE)
 #
 # Define NO_IPV6 if you lack IPv6 support and getaddrinfo().