comparison includes.h @ 378:a124aff0cbf1

merge of '182c2d8dbd5321ef4d1df8758936f4dc7127015f' and '31dcd7a22983ef19d6c63248e415e71d292dd0ec'
author Matt Johnston <matt@ucc.asn.au>
date Wed, 06 Dec 2006 13:11:41 +0000
parents 1bfa65fed772 e17f0333c21e
children 1afa503e33f5
comparison
equal deleted inserted replaced
377:1bfa65fed772 378:a124aff0cbf1
133 133
134 #ifndef LOG_AUTHPRIV 134 #ifndef LOG_AUTHPRIV
135 #define LOG_AUTHPRIV LOG_AUTH 135 #define LOG_AUTHPRIV LOG_AUTH
136 #endif 136 #endif
137 137
138 /* glibc 2.1.3 systems have sockaddr_storage.__ss_family rather than
139 * sockaddr_storage.ss_family */
140 #if !defined(HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY) \
141 && defined(HAVE_STRUCT_SOCKADDR_STORAGE___SS_FAMILY)
142 #define ss_family __ss_family
143 #endif
144
145 /* so we can avoid warnings about unused params (ie in signal handlers etc) */ 138 /* so we can avoid warnings about unused params (ie in signal handlers etc) */
146 #ifdef UNUSED 139 #ifdef UNUSED
147 #elif defined(__GNUC__) 140 #elif defined(__GNUC__)
148 # define UNUSED(x) UNUSED_ ## x __attribute__((unused)) 141 # define UNUSED(x) UNUSED_ ## x __attribute__((unused))
149 #elif defined(__LCLINT__) 142 #elif defined(__LCLINT__)