Mercurial > dropbear
changeset 254:8b62b0ea8f3b
* include netinet/in_systm.h if available before netinet/ip.h, since
netbsd seems to require it for some reason. hooray for many unices.
| author | Matt Johnston <matt@ucc.asn.au> |
|---|---|
| date | Mon, 31 Oct 2005 07:49:57 +0000 |
| parents | 84925eceeb13 |
| children | 89ace56293f6 |
| files | configure.in includes.h |
| diffstat | 2 files changed, 11 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.in Thu Oct 20 16:53:12 2005 +0000 +++ b/configure.in Mon Oct 31 07:49:57 2005 +0000 @@ -206,7 +206,7 @@ # Checks for header files. AC_HEADER_STDC AC_HEADER_SYS_WAIT -AC_CHECK_HEADERS([fcntl.h limits.h netinet/in.h netinet/tcp.h stdlib.h string.h sys/socket.h sys/time.h termios.h unistd.h crypt.h pty.h ioctl.h libutil.h libgen.h inttypes.h stropts.h utmp.h utmpx.h lastlog.h paths.h util.h netdb.h security/pam_appl.h pam/pam_appl.h]) +AC_CHECK_HEADERS([fcntl.h limits.h netinet/in.h netinet/tcp.h stdlib.h string.h sys/socket.h sys/time.h termios.h unistd.h crypt.h pty.h ioctl.h libutil.h libgen.h inttypes.h stropts.h utmp.h utmpx.h lastlog.h paths.h util.h netdb.h security/pam_appl.h pam/pam_appl.h netinet/in_systm.h]) # Checks for typedefs, structures, and compiler characteristics. AC_C_CONST
--- a/includes.h Thu Oct 20 16:53:12 2005 +0000 +++ b/includes.h Mon Oct 31 07:49:57 2005 +0000 @@ -44,8 +44,6 @@ #include <fcntl.h> #include <grp.h> #include <limits.h> -#include <netinet/in.h> -#include <netinet/ip.h> #include <pwd.h> #include <signal.h> #include <stdlib.h> @@ -58,8 +56,6 @@ #include <stdarg.h> #include <dirent.h> -#include <arpa/inet.h> - #ifdef HAVE_UTMP_H #include <utmp.h> #endif @@ -76,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