diff options
Diffstat (limited to 'includes.h')
| -rw-r--r-- | includes.h | 20 |
1 files changed, 17 insertions, 3 deletions
@@ -44,7 +44,6 @@ #include <fcntl.h> #include <grp.h> #include <limits.h> -#include <netinet/in.h> #include <pwd.h> #include <signal.h> #include <stdlib.h> @@ -57,8 +56,6 @@ #include <stdarg.h> #include <dirent.h> -#include <arpa/inet.h> - #ifdef HAVE_UTMP_H #include <utmp.h> #endif @@ -75,10 +72,20 @@ #include <lastlog.h> #endif +#include <arpa/inet.h> + #ifdef HAVE_NETINET_IN_H #include <netinet/in.h> #endif +/* netbsd 1.6 needs this to be included before netinet/ip.h for some + * undocumented reason */ +#ifdef HAVE_NETINET_IN_SYSTM_H +#include <netinet/in_systm.h> +#endif + +#include <netinet/ip.h> + #ifdef HAVE_NETINET_TCP_H #include <netinet/tcp.h> #endif @@ -128,6 +135,13 @@ typedef u_int16_t uint16_t; #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__) |