Module Name: src Committed By: martin Date: Thu Aug 17 09:38:37 UTC 2017
Modified Files: src/include [netbsd-6-0]: resolv.h src/sys/netinet [netbsd-6-0]: ip.h Log Message: Pull up following revision(s) (requested by mrg in ticket #721): include/resolv.h: revision 1.40 sys/netinet/ip.h: revision 1.33-1.34 fix typo make this standalone, like every others (except OpenBSD) add <netinet/in.h> because it is needed for sockaddr_in. To generate a diff of this commit: cvs rdiff -u -r1.38 -r1.38.14.1 src/include/resolv.h cvs rdiff -u -r1.32 -r1.32.14.1 src/sys/netinet/ip.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/include/resolv.h diff -u src/include/resolv.h:1.38 src/include/resolv.h:1.38.14.1 --- src/include/resolv.h:1.38 Sat Oct 24 17:23:34 2009 +++ src/include/resolv.h Thu Aug 17 09:38:37 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: resolv.h,v 1.38 2009/10/24 17:23:34 christos Exp $ */ +/* $NetBSD: resolv.h,v 1.38.14.1 2017/08/17 09:38:37 martin Exp $ */ /* * Portions Copyright (C) 2004, 2005, 2008, 2009 Internet Systems Consortium, Inc. ("ISC") @@ -63,6 +63,7 @@ #include <sys/cdefs.h> #include <sys/socket.h> #include <stdio.h> +#include <netinet/in.h> #include <arpa/nameser.h> /*% Index: src/sys/netinet/ip.h diff -u src/sys/netinet/ip.h:1.32 src/sys/netinet/ip.h:1.32.14.1 --- src/sys/netinet/ip.h:1.32 Sun Jul 24 18:06:08 2011 +++ src/sys/netinet/ip.h Thu Aug 17 09:38:37 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: ip.h,v 1.32 2011/07/24 18:06:08 christos Exp $ */ +/* $NetBSD: ip.h,v 1.32.14.1 2017/08/17 09:38:37 martin Exp $ */ /* * Copyright (c) 1982, 1986, 1993 @@ -34,6 +34,7 @@ #ifndef _NETINET_IP_H_ #define _NETINET_IP_H_ +#include <netinet/in_systm.h> /* for n_time */ /* * Definitions for internet protocol version 4. * Per RFC 791, September 1981.