# HG changeset patch
# User Matt Johnston <matt@ucc.asn.au>
# Date 1133891399 0
# Node ID a3a68c25035e356ba37539d592a39eafe3f16cc9
# Parent  82393badfa24b20dd41c700ce86b4621a0a48ee6
	* workaround for systems such as glibc 2.1 that have
	sockaddr_storage.__ss_family rather than sockaddr_storage.ss_family

diff -r 82393badfa24 -r a3a68c25035e configure.in
--- a/configure.in	Tue Dec 06 17:32:53 2005 +0000
+++ b/configure.in	Tue Dec 06 17:49:59 2005 +0000
@@ -339,8 +339,9 @@
 #endif
 ])
 
-AC_CHECK_MEMBERS([struct utmpx.ut_host, struct utmpx.ut_syslen, struct utmpx.ut_type, struct utmpx.ut_id, struct utmpx.ut_addr, struct utmpx.ut_addr_v6, struct utmpx.ut_time, struct utmpx.ut_tv],,,[
+AC_CHECK_MEMBERS([struct utmpx.ut_host, struct utmpx.ut_syslen, struct utmpx.ut_type, struct utmpx.ut_id, struct utmpx.ut_addr, struct utmpx.ut_addr_v6, struct utmpx.ut_time, struct utmpx.ut_tv, struct sockaddr_storage.ss_family, struct sockadd_storage.__family],,,[
 #include <sys/types.h>
+#include <sys/socket.h>
 #if HAVE_UTMPX_H
 #include <utmpx.h>
 #endif
diff -r 82393badfa24 -r a3a68c25035e includes.h
--- a/includes.h	Tue Dec 06 17:32:53 2005 +0000
+++ b/includes.h	Tue Dec 06 17:49:59 2005 +0000
@@ -135,6 +135,13 @@
 #define LOG_AUTHPRIV LOG_AUTH
 #endif
 
+/* glibc 2.1.3 systems have sockaddr_storage.__ss_family rather than
+ * sockaddr_storage.ss_family */
+#if !defined(HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY) \
+    && defined(HAVE_STRUCT_SOCKADDR_STORAGE___SS_FAMILY)
+#define ss_family __ss_family
+#endif
+
 /* so we can avoid warnings about unused params (ie in signal handlers etc) */
 #ifdef UNUSED 
 #elif defined(__GNUC__)