changeset 262:a3a68c25035e

* workaround for systems such as glibc 2.1 that have sockaddr_storage.__ss_family rather than sockaddr_storage.ss_family
author Matt Johnston <matt@ucc.asn.au>
date Tue, 06 Dec 2005 17:49:59 +0000
parents 82393badfa24
children c66797d973ff
files configure.in includes.h
diffstat 2 files changed, 9 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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__)