Print this page
remove support for non-ANSI compilation
| Split |
Close |
| Expand all |
| Collapse all |
--- old/usr/src/head/arpa/inet.h
+++ new/usr/src/head/arpa/inet.h
1 1 /*
2 2 * CDDL HEADER START
3 3 *
4 4 * The contents of this file are subject to the terms of the
5 5 * Common Development and Distribution License (the "License").
6 6 * You may not use this file except in compliance with the License.
7 7 *
8 8 * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
9 9 * or http://www.opensolaris.org/os/licensing.
10 10 * See the License for the specific language governing permissions
|
↓ open down ↓ |
10 lines elided |
↑ open up ↑ |
11 11 * and limitations under the License.
12 12 *
13 13 * When distributing Covered Code, include this CDDL HEADER in each
14 14 * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
15 15 * If applicable, add the following below this CDDL HEADER, with the
16 16 * fields enclosed by brackets "[]" replaced with your own identifying
17 17 * information: Portions Copyright [yyyy] [name of copyright owner]
18 18 *
19 19 * CDDL HEADER END
20 20 *
21 + * Copyright 2014 Garrett D'Amore <garrett@damore.org>
22 + *
21 23 * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
22 24 * Use is subject to license terms.
23 25 *
24 26 * Copyright 2011 Nexenta Systems, Inc. All rights reserved.
25 27 */
26 28
27 29 /* Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T */
28 30 /* All Rights Reserved */
29 31
30 32 /*
31 33 * Portions of this source code were derived from Berkeley 4.3 BSD
32 34 * under license from the Regents of the University of California.
33 35 */
34 36
35 37 #ifndef _ARPA_INET_H
36 38 #define _ARPA_INET_H
37 39
38 40 #include <sys/feature_tests.h>
39 41
40 42 #if !defined(_XPG4_2) || defined(_XPG6) || defined(__EXTENSIONS__)
41 43 #include <sys/socket.h>
42 44 #endif /* !defined(_XPG4_2) || defined(_XPG6) || defined(__EXTENSIONS__) */
43 45
44 46 #include <netinet/in.h>
45 47 #if defined(_XPG4_2) && !defined(__EXTENSIONS__)
46 48 #include <sys/byteorder.h>
|
↓ open down ↓ |
16 lines elided |
↑ open up ↑ |
47 49 #endif /* defined(_XPG4_2) && !defined(__EXTENSIONS__) */
48 50
49 51 #ifdef __cplusplus
50 52 extern "C" {
51 53 #endif
52 54
53 55 /*
54 56 * External definitions for
55 57 * functions in inet(3N)
56 58 */
57 -#ifdef __STDC__
58 59 #if !defined(_XPG4_2) || defined(__EXTENSIONS__)
59 60 extern int inet_net_pton(int, const char *, void *, size_t);
60 61 extern boolean_t inet_matchaddr(const void *, const char *);
61 62 #endif /* !defined(_XPG4_2) || defined(__EXTENSIONS__) */
62 63
63 64 #if !defined(_XPG4_2) || defined(_XPG6) || defined(__EXTENSIONS__)
64 65 extern int inet_pton(int, const char *_RESTRICT_KYWD, void *_RESTRICT_KYWD);
65 66 extern const char *inet_ntop(int, const void *_RESTRICT_KYWD,
66 67 char *_RESTRICT_KYWD, socklen_t);
67 68 #endif /* !defined(_XPG4_2) || defined(_XPG6) || defined(__EXTENSIONS__) */
68 69
69 70 extern in_addr_t inet_addr(const char *);
70 71 /*
71 72 * With the introduction of CIDR the
72 73 * following 4 routines are now considered to be Obsolete
73 74 */
74 75 extern in_addr_t inet_lnaof(struct in_addr);
75 76 extern struct in_addr inet_makeaddr(in_addr_t, in_addr_t);
76 77 extern in_addr_t inet_netof(struct in_addr);
77 78 extern in_addr_t inet_network(const char *);
78 79
79 80
80 81 extern char *inet_neta(ulong_t, char *, size_t);
|
↓ open down ↓ |
13 lines elided |
↑ open up ↑ |
81 82 extern char *inet_net_ntop(int, const void *, int, char *, size_t);
82 83
83 84 extern char *inet_cidr_ntop(int, const void *, int, char *, size_t);
84 85 extern int inet_cidr_pton(int, const char *, void *, int *);
85 86 extern char *inet_ntoa(struct in_addr);
86 87 extern int inet_aton(const char *, struct in_addr *);
87 88
88 89 extern uint_t inet_nsap_addr(const char *, uchar_t *, int);
89 90 extern char *inet_nsap_ntoa(int, const uchar_t *, char *);
90 91
91 -#else
92 -unsigned long inet_addr();
93 -char *inet_ntoa();
94 -/*
95 - * With the introduction of CIDR the
96 - * following 4 routines are now considered to be Obsolete
97 - */
98 -struct in_addr inet_makeaddr();
99 -unsigned long inet_network();
100 -extern unsigned long inet_lnaof();
101 -extern unsigned long inet_netof();
102 -
103 -extern int inet_pton();
104 -extern const char *inet_ntop();
105 -extern int inet_aton();
106 -
107 -#endif
108 -
109 92 #ifdef __cplusplus
110 93 }
111 94 #endif
112 95
113 96 #endif /* _ARPA_INET_H */
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX