Deleted Added
full compact
in.h (266276) in.h (266842)
1/*-
2 * Copyright (c) 1982, 1986, 1990, 1993
3 * The Regents of the University of California. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 13 unchanged lines hidden (view full) ---

22 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
23 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27 * SUCH DAMAGE.
28 *
29 * @(#)in.h 8.3 (Berkeley) 1/3/94
1/*-
2 * Copyright (c) 1982, 1986, 1990, 1993
3 * The Regents of the University of California. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 13 unchanged lines hidden (view full) ---

22 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
23 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27 * SUCH DAMAGE.
28 *
29 * @(#)in.h 8.3 (Berkeley) 1/3/94
30 * $FreeBSD: head/sys/netinet/in.h 266276 2014-05-17 00:09:12Z adrian $
30 * $FreeBSD: head/sys/netinet/in.h 266842 2014-05-29 15:23:37Z jilles $
31 */
32
33#ifndef _NETINET_IN_H_
34#define _NETINET_IN_H_
35
36#include <sys/cdefs.h>
37#include <sys/_types.h>
38#include <machine/endian.h>

--- 56 unchanged lines hidden (view full) ---

95struct sockaddr_in {
96 uint8_t sin_len;
97 sa_family_t sin_family;
98 in_port_t sin_port;
99 struct in_addr sin_addr;
100 char sin_zero[8];
101};
102
31 */
32
33#ifndef _NETINET_IN_H_
34#define _NETINET_IN_H_
35
36#include <sys/cdefs.h>
37#include <sys/_types.h>
38#include <machine/endian.h>

--- 56 unchanged lines hidden (view full) ---

95struct sockaddr_in {
96 uint8_t sin_len;
97 sa_family_t sin_family;
98 in_port_t sin_port;
99 struct in_addr sin_addr;
100 char sin_zero[8];
101};
102
103#if !defined(_KERNEL) && __BSD_VISIBLE
103#if !defined(_KERNEL) && __POSIX_VISIBLE >= 200112
104
105#ifndef _BYTEORDER_PROTOTYPED
106#define _BYTEORDER_PROTOTYPED
107__BEGIN_DECLS
108uint32_t htonl(uint32_t);
109uint16_t htons(uint16_t);
110uint32_t ntohl(uint32_t);
111uint16_t ntohs(uint16_t);
112__END_DECLS
113#endif
114
115#ifndef _BYTEORDER_FUNC_DEFINED
116#define _BYTEORDER_FUNC_DEFINED
117#define htonl(x) __htonl(x)
118#define htons(x) __htons(x)
119#define ntohl(x) __ntohl(x)
120#define ntohs(x) __ntohs(x)
121#endif
122
104
105#ifndef _BYTEORDER_PROTOTYPED
106#define _BYTEORDER_PROTOTYPED
107__BEGIN_DECLS
108uint32_t htonl(uint32_t);
109uint16_t htons(uint16_t);
110uint32_t ntohl(uint32_t);
111uint16_t ntohs(uint16_t);
112__END_DECLS
113#endif
114
115#ifndef _BYTEORDER_FUNC_DEFINED
116#define _BYTEORDER_FUNC_DEFINED
117#define htonl(x) __htonl(x)
118#define htons(x) __htons(x)
119#define ntohl(x) __ntohl(x)
120#define ntohs(x) __ntohs(x)
121#endif
122
123#endif /* !_KERNEL && __BSD_VISIBLE */
123#endif /* !_KERNEL && __POSIX_VISIBLE >= 200112 */
124
125#if __POSIX_VISIBLE >= 200112
126#define IPPROTO_IPV6 41 /* IP6 header */
127#define IPPROTO_RAW 255 /* raw IP packet */
128#define INET_ADDRSTRLEN 16
129#endif
130
131#if __BSD_VISIBLE

--- 532 unchanged lines hidden ---
124
125#if __POSIX_VISIBLE >= 200112
126#define IPPROTO_IPV6 41 /* IP6 header */
127#define IPPROTO_RAW 255 /* raw IP packet */
128#define INET_ADDRSTRLEN 16
129#endif
130
131#if __BSD_VISIBLE

--- 532 unchanged lines hidden ---