diff options
| author |   guenther <guenther@openbsd.org> | 2017-02-04 02:54:33 +0000 |
|---|---|---|
| committer | guenther <guenther@openbsd.org> | 2017-02-04 02:54:33 +0000 |
| commit | 828e760f53b8314f390c6402bf66cd3b22dfbb58 (patch) | |
| tree | 88cc691a07e12535169310b5c9d5811b36ab425d /sys | |
| parent | use ssh_packet_set_log_preamble() to include connection username (diff) | |
| download | wireguard-openbsd-828e760f53b8314f390c6402bf66cd3b22dfbb58.tar.xz wireguard-openbsd-828e760f53b8314f390c6402bf66cd3b22dfbb58.zip | |
Move the typedefs for in_{addr,port}_t from <sys/types.h> to
<netinet/in.h> and <arpa/inet.h>
ok and ports test naddy@ (thanks!)
ok krw@ beck@ millert@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/netinet/in.h | 8 | ||||
| -rw-r--r-- | sys/sys/types.h | 13 |
2 files changed, 8 insertions, 13 deletions
diff --git a/sys/netinet/in.h b/sys/netinet/in.h index 997478c4f21..ab2c9ca63b9 100644 --- a/sys/netinet/in.h +++ b/sys/netinet/in.h @@ -1,4 +1,4 @@ -/* $OpenBSD: in.h,v 1.120 2016/12/22 11:04:44 rzalamena Exp $ */ +/* $OpenBSD: in.h,v 1.121 2017/02/04 02:54:33 guenther Exp $ */ /* $NetBSD: in.h,v 1.20 1996/02/13 23:41:47 christos Exp $ */ /* @@ -58,6 +58,12 @@ typedef __sa_family_t sa_family_t; /* sockaddr address family type */ #endif /* _SA_FAMILY_T_DEFINED_ */ +#ifndef _IN_TYPES_DEFINED_ +#define _IN_TYPES_DEFINED_ +typedef __in_addr_t in_addr_t; /* base type for internet address */ +typedef __in_port_t in_port_t; /* IP port type */ +#endif + /* * Protocols */ diff --git a/sys/sys/types.h b/sys/sys/types.h index a9ac053b636..647359c175f 100644 --- a/sys/sys/types.h +++ b/sys/sys/types.h @@ -1,4 +1,4 @@ -/* $OpenBSD: types.h,v 1.46 2016/09/12 19:41:20 guenther Exp $ */ +/* $OpenBSD: types.h,v 1.47 2017/02/04 02:54:33 guenther Exp $ */ /* $NetBSD: types.h,v 1.29 1996/11/15 22:48:25 jtc Exp $ */ /*- @@ -152,17 +152,6 @@ typedef __fsblkcnt_t fsblkcnt_t; /* file system block count */ typedef __fsfilcnt_t fsfilcnt_t; /* file system file count */ /* - * XPG4.2 states that inclusion of <netinet/in.h> must pull these - * in and that inclusion of <sys/socket.h> must pull in sa_family_t. - * We put these here because there are other headers that require - * these types and <sys/socket.h> and <netinet/in.h> will indirectly - * include <sys/types.h>. - * XXX - now that we have protected versions these should move. - */ -typedef __in_addr_t in_addr_t; /* base type for internet address */ -typedef __in_port_t in_port_t; /* IP port type */ - -/* * The following types may be defined in multiple header files. */ #ifndef _CLOCK_T_DEFINED_ |