Print this page
remove support for non-ANSI compilation
| Split |
Close |
| Expand all |
| Collapse all |
--- old/usr/src/head/search.h
+++ new/usr/src/head/search.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, Version 1.0 only
6 6 * (the "License"). You may not use this file except in compliance
7 7 * with the License.
8 8 *
9 9 * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
10 10 * or http://www.opensolaris.org/os/licensing.
11 11 * See the License for the specific language governing permissions
12 12 * and limitations under the License.
13 13 *
14 14 * When distributing Covered Code, include this CDDL HEADER in each
|
↓ open down ↓ |
14 lines elided |
↑ open up ↑ |
15 15 * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
16 16 * If applicable, add the following below this CDDL HEADER, with the
17 17 * fields enclosed by brackets "[]" replaced with your own identifying
18 18 * information: Portions Copyright [yyyy] [name of copyright owner]
19 19 *
20 20 * CDDL HEADER END
21 21 */
22 22 /* Copyright (c) 1988 AT&T */
23 23 /* All Rights Reserved */
24 24
25 -
26 25 /*
26 + * Copyright 2014 Garrett D'Amore <garrett@damore.org>
27 + *
27 28 * Copyright 2003 Sun Microsystems, Inc. All rights reserved.
28 29 * Use is subject to license terms.
29 30 */
30 31
31 32 #ifndef _SEARCH_H
32 33 #define _SEARCH_H
33 34
34 -#pragma ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.3.1.11 */
35 -
36 35 #include <sys/feature_tests.h>
37 36 #include <sys/types.h>
38 37
39 38 #ifdef __cplusplus
40 39 extern "C" {
41 40 #endif
42 41
43 42 /* HSEARCH(3C) */
44 43 typedef enum { FIND, ENTER } ACTION;
45 44
46 45 #if defined(__EXTENSIONS__) || !defined(_XOPEN_SOURCE)
47 46 struct qelem {
48 47 struct qelem *q_forw;
49 48 struct qelem *q_back;
50 49 };
51 50 #endif /* defined(__EXTENSIONS__) || !defined(_XOPEN_SOURCE) */
52 51
53 52 typedef struct entry { char *key, *data; } ENTRY;
54 53
55 -#if defined(__STDC__)
56 -
57 54 int hcreate(size_t);
58 55 void hdestroy(void);
59 56 ENTRY *hsearch(ENTRY, ACTION);
60 57 #if defined(__EXTENSIONS__) || !defined(_XOPEN_SOURCE) || defined(_XPG4_2)
61 58 void insque(void *, void *);
62 59 void remque(void *);
63 60 #endif
64 61
65 -#else /* defined(__STDC__) */
66 62
67 -int hcreate();
68 -void hdestroy();
69 -ENTRY *hsearch();
70 -#if defined(__EXTENSIONS__) || !defined(_XOPEN_SOURCE) || defined(_XPG4_2)
71 -void insque();
72 -void remque();
73 -#endif
74 -
75 -#endif /* defined(__STDC__) */
76 -
77 63 /* TSEARCH(3C) */
78 64 typedef enum { preorder, postorder, endorder, leaf } VISIT;
79 65
80 -#if defined(__STDC__)
81 66 void *tdelete(const void *_RESTRICT_KYWD, void **_RESTRICT_KYWD,
82 67 int (*)(const void *, const void *));
83 68 void *tfind(const void *, void *const *, int (*)(const void *, const void *));
84 69 void *tsearch(const void *, void **, int (*)(const void *, const void *));
85 70 void twalk(const void *, void (*)(const void *, VISIT, int));
86 -#else
87 -void *tdelete();
88 -void *tfind();
89 -void *tsearch();
90 -void twalk();
91 -#endif
92 71
93 -#if defined(__STDC__)
94 72
95 73 #if defined(__EXTENSIONS__) || !defined(_XOPEN_SOURCE)
96 74 /* BSEARCH(3C) */
97 75 void *bsearch(const void *, const void *, size_t, size_t,
98 76 int (*)(const void *, const void *));
99 77 #endif /* defined(__EXTENSIONS__) || !defined(_XOPEN_SOURCE) */
100 78
101 79 /* LSEARCH(3C) */
102 80 void *lfind(const void *, const void *, size_t *, size_t,
103 81 int (*)(const void *, const void *));
104 82 void *lsearch(const void *, void *, size_t *, size_t,
105 83 int (*)(const void *, const void *));
106 -#else
107 -void *bsearch();
108 -void *lfind();
109 -void *lsearch();
110 -#endif
111 84
112 85 #ifdef __cplusplus
113 86 }
114 87 #endif
115 88
116 89 #endif /* _SEARCH_H */
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX