From: Heiko Hund <heiko.hund@sophos.com>
Date: Fri, 17 Jan 2014 15:30:37 +0000 (+0100)
Subject: make sure sa_family_t is defined
X-Git-Tag: v2.4_alpha1~478
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=87b468d42811f0ca6f046b3a0335811370193514;p=thirdparty%2Fopenvpn.git

make sure sa_family_t is defined

On Windows there's no sa_family_t. This patch defines it in
syshead.h is configure did not find it in the system headers.

Signed-off-by: Heiko Hund <heiko.hund@sophos.com>
Acked-by: Arne Schwabe <arne@rfc2549.org>
Message-Id: <1389972638-8006-1-git-send-email-heiko.hund@sophos.com>
URL: http://article.gmane.org/gmane.network.openvpn.devel/8242
Signed-off-by: Gert Doering <gert@greenie.muc.de>
---

diff --git a/configure.ac b/configure.ac
index 636d4e25d..380dcdbb7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -500,6 +500,12 @@ AC_CHECK_TYPE(
 	,
 	[[${SOCKET_INCLUDES}]]
 )
+AC_CHECK_TYPE(
+        [sa_family_t],
+        [AC_DEFINE([HAVE_SA_FAMILY_T], [1], [sa_family_t, needed to hold AF_* info])],
+        ,
+        [[${SOCKET_INCLUDES}]]
+)
 AC_CHECK_TYPE(
 	[struct sockaddr_in6],
 	,
diff --git a/src/openvpn/syshead.h b/src/openvpn/syshead.h
index ab6fa01f7..4050d548d 100644
--- a/src/openvpn/syshead.h
+++ b/src/openvpn/syshead.h
@@ -425,6 +425,13 @@
 #define SOL_IP IPPROTO_IP
 #endif
 
+/*
+ * Define type sa_family_t if it isn't defined in the socket headers
+ */
+#ifndef HAVE_SA_FAMILY_T
+typedef unsigned short sa_family_t;
+#endif
+
 /*
  * Disable ESEC
  */