diff options
author | Damien Miller <djm@mindrot.org> | 2020-08-04 14:58:46 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2020-08-04 14:58:46 +1000 |
commit | c9e3be9f4b41fda32a2a0138d54c7a6b563bc94d (patch) | |
tree | 829c508c22c8d251c5ccbd7c3e938cdccb596a22 | |
parent | 2d8a3b7e8b0408dfeb933ac5cfd3a58f5bac49af (diff) |
undef TAILQ_CONCAT and friends
Needed for NetBSD. etc that supply these macros
-rw-r--r-- | openbsd-compat/sys-queue.h | 115 |
1 files changed, 59 insertions, 56 deletions
diff --git a/openbsd-compat/sys-queue.h b/openbsd-compat/sys-queue.h index a171f8b55..816c15cd4 100644 --- a/openbsd-compat/sys-queue.h +++ b/openbsd-compat/sys-queue.h | |||
@@ -41,90 +41,93 @@ | |||
41 | * Require for OS/X and other platforms that have old/broken/incomplete | 41 | * Require for OS/X and other platforms that have old/broken/incomplete |
42 | * <sys/queue.h>. | 42 | * <sys/queue.h>. |
43 | */ | 43 | */ |
44 | #undef SLIST_HEAD | 44 | #undef CIRCLEQ_EMPTY |
45 | #undef SLIST_HEAD_INITIALIZER | 45 | #undef CIRCLEQ_END |
46 | #undef SLIST_ENTRY | 46 | #undef CIRCLEQ_ENTRY |
47 | #undef SLIST_FOREACH_PREVPTR | 47 | #undef CIRCLEQ_FIRST |
48 | #undef SLIST_FOREACH_SAFE | 48 | #undef CIRCLEQ_FOREACH |
49 | #undef SLIST_FIRST | 49 | #undef CIRCLEQ_FOREACH_REVERSE |
50 | #undef SLIST_END | 50 | #undef CIRCLEQ_HEAD |
51 | #undef SLIST_EMPTY | 51 | #undef CIRCLEQ_HEAD_INITIALIZER |
52 | #undef SLIST_NEXT | 52 | #undef CIRCLEQ_INIT |
53 | #undef SLIST_FOREACH | 53 | #undef CIRCLEQ_INSERT_AFTER |
54 | #undef SLIST_INIT | 54 | #undef CIRCLEQ_INSERT_BEFORE |
55 | #undef SLIST_INSERT_AFTER | 55 | #undef CIRCLEQ_INSERT_HEAD |
56 | #undef SLIST_INSERT_HEAD | 56 | #undef CIRCLEQ_INSERT_TAIL |
57 | #undef SLIST_REMOVE_HEAD | 57 | #undef CIRCLEQ_LAST |
58 | #undef SLIST_REMOVE_AFTER | 58 | #undef CIRCLEQ_NEXT |
59 | #undef SLIST_REMOVE | 59 | #undef CIRCLEQ_PREV |
60 | #undef SLIST_REMOVE_NEXT | 60 | #undef CIRCLEQ_REMOVE |
61 | #undef LIST_HEAD | 61 | #undef CIRCLEQ_REPLACE |
62 | #undef LIST_HEAD_INITIALIZER | 62 | #undef LIST_EMPTY |
63 | #undef LIST_END | ||
63 | #undef LIST_ENTRY | 64 | #undef LIST_ENTRY |
64 | #undef LIST_FIRST | 65 | #undef LIST_FIRST |
65 | #undef LIST_END | ||
66 | #undef LIST_EMPTY | ||
67 | #undef LIST_NEXT | ||
68 | #undef LIST_FOREACH | 66 | #undef LIST_FOREACH |
69 | #undef LIST_FOREACH_SAFE | 67 | #undef LIST_FOREACH_SAFE |
68 | #undef LIST_HEAD | ||
69 | #undef LIST_HEAD_INITIALIZER | ||
70 | #undef LIST_INIT | 70 | #undef LIST_INIT |
71 | #undef LIST_INSERT_AFTER | 71 | #undef LIST_INSERT_AFTER |
72 | #undef LIST_INSERT_BEFORE | 72 | #undef LIST_INSERT_BEFORE |
73 | #undef LIST_INSERT_HEAD | 73 | #undef LIST_INSERT_HEAD |
74 | #undef LIST_NEXT | ||
74 | #undef LIST_REMOVE | 75 | #undef LIST_REMOVE |
75 | #undef LIST_REPLACE | 76 | #undef LIST_REPLACE |
76 | #undef SIMPLEQ_HEAD | 77 | #undef SIMPLEQ_CONCAT |
77 | #undef SIMPLEQ_HEAD_INITIALIZER | 78 | #undef SIMPLEQ_EMPTY |
79 | #undef SIMPLEQ_END | ||
78 | #undef SIMPLEQ_ENTRY | 80 | #undef SIMPLEQ_ENTRY |
79 | #undef SIMPLEQ_FIRST | 81 | #undef SIMPLEQ_FIRST |
80 | #undef SIMPLEQ_END | ||
81 | #undef SIMPLEQ_EMPTY | ||
82 | #undef SIMPLEQ_NEXT | ||
83 | #undef SIMPLEQ_FOREACH | 82 | #undef SIMPLEQ_FOREACH |
84 | #undef SIMPLEQ_FOREACH_SAFE | 83 | #undef SIMPLEQ_FOREACH_SAFE |
84 | #undef SIMPLEQ_HEAD | ||
85 | #undef SIMPLEQ_HEAD_INITIALIZER | ||
85 | #undef SIMPLEQ_INIT | 86 | #undef SIMPLEQ_INIT |
87 | #undef SIMPLEQ_INSERT_AFTER | ||
86 | #undef SIMPLEQ_INSERT_HEAD | 88 | #undef SIMPLEQ_INSERT_HEAD |
87 | #undef SIMPLEQ_INSERT_TAIL | 89 | #undef SIMPLEQ_INSERT_TAIL |
88 | #undef SIMPLEQ_INSERT_AFTER | 90 | #undef SIMPLEQ_NEXT |
91 | #undef SIMPLEQ_REMOVE_AFTER | ||
89 | #undef SIMPLEQ_REMOVE_HEAD | 92 | #undef SIMPLEQ_REMOVE_HEAD |
90 | #undef TAILQ_HEAD | 93 | #undef SLIST_EMPTY |
91 | #undef TAILQ_HEAD_INITIALIZER | 94 | #undef SLIST_END |
95 | #undef SLIST_ENTRY | ||
96 | #undef SLIST_FIRST | ||
97 | #undef SLIST_FOREACH | ||
98 | #undef SLIST_FOREACH_PREVPTR | ||
99 | #undef SLIST_FOREACH_SAFE | ||
100 | #undef SLIST_HEAD | ||
101 | #undef SLIST_HEAD_INITIALIZER | ||
102 | #undef SLIST_INIT | ||
103 | #undef SLIST_INSERT_AFTER | ||
104 | #undef SLIST_INSERT_HEAD | ||
105 | #undef SLIST_NEXT | ||
106 | #undef SLIST_REMOVE | ||
107 | #undef SLIST_REMOVE_AFTER | ||
108 | #undef SLIST_REMOVE_HEAD | ||
109 | #undef SLIST_REMOVE_NEXT | ||
110 | #undef TAILQ_CONCAT | ||
111 | #undef TAILQ_EMPTY | ||
112 | #undef TAILQ_END | ||
92 | #undef TAILQ_ENTRY | 113 | #undef TAILQ_ENTRY |
93 | #undef TAILQ_FIRST | 114 | #undef TAILQ_FIRST |
94 | #undef TAILQ_END | ||
95 | #undef TAILQ_NEXT | ||
96 | #undef TAILQ_LAST | ||
97 | #undef TAILQ_PREV | ||
98 | #undef TAILQ_EMPTY | ||
99 | #undef TAILQ_FOREACH | 115 | #undef TAILQ_FOREACH |
100 | #undef TAILQ_FOREACH_REVERSE | 116 | #undef TAILQ_FOREACH_REVERSE |
101 | #undef TAILQ_FOREACH_SAFE | ||
102 | #undef TAILQ_FOREACH_REVERSE_SAFE | 117 | #undef TAILQ_FOREACH_REVERSE_SAFE |
118 | #undef TAILQ_FOREACH_SAFE | ||
119 | #undef TAILQ_HEAD | ||
120 | #undef TAILQ_HEAD_INITIALIZER | ||
103 | #undef TAILQ_INIT | 121 | #undef TAILQ_INIT |
104 | #undef TAILQ_INSERT_HEAD | ||
105 | #undef TAILQ_INSERT_TAIL | ||
106 | #undef TAILQ_INSERT_AFTER | 122 | #undef TAILQ_INSERT_AFTER |
107 | #undef TAILQ_INSERT_BEFORE | 123 | #undef TAILQ_INSERT_BEFORE |
124 | #undef TAILQ_INSERT_HEAD | ||
125 | #undef TAILQ_INSERT_TAIL | ||
126 | #undef TAILQ_LAST | ||
127 | #undef TAILQ_NEXT | ||
128 | #undef TAILQ_PREV | ||
108 | #undef TAILQ_REMOVE | 129 | #undef TAILQ_REMOVE |
109 | #undef TAILQ_REPLACE | 130 | #undef TAILQ_REPLACE |
110 | #undef CIRCLEQ_HEAD | ||
111 | #undef CIRCLEQ_HEAD_INITIALIZER | ||
112 | #undef CIRCLEQ_ENTRY | ||
113 | #undef CIRCLEQ_FIRST | ||
114 | #undef CIRCLEQ_LAST | ||
115 | #undef CIRCLEQ_END | ||
116 | #undef CIRCLEQ_NEXT | ||
117 | #undef CIRCLEQ_PREV | ||
118 | #undef CIRCLEQ_EMPTY | ||
119 | #undef CIRCLEQ_FOREACH | ||
120 | #undef CIRCLEQ_FOREACH_REVERSE | ||
121 | #undef CIRCLEQ_INIT | ||
122 | #undef CIRCLEQ_INSERT_AFTER | ||
123 | #undef CIRCLEQ_INSERT_BEFORE | ||
124 | #undef CIRCLEQ_INSERT_HEAD | ||
125 | #undef CIRCLEQ_INSERT_TAIL | ||
126 | #undef CIRCLEQ_REMOVE | ||
127 | #undef CIRCLEQ_REPLACE | ||
128 | 131 | ||
129 | /* | 132 | /* |
130 | * This file defines five types of data structures: singly-linked lists, | 133 | * This file defines five types of data structures: singly-linked lists, |