diff options
| author | Damien Miller <djm@mindrot.org> | 2007-10-26 08:37:43 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2007-10-26 08:37:43 +0200 |
| commit | 88aa4e3d61baebe5db400000f9475f1608054b49 (patch) | |
| tree | 06a27718a3ab4922d543100368b559cc1b08c0fd /openbsd-compat/sys-tree.h | |
| parent | - jakob@cvs.openbsd.org 2007/10/11 18:36:41 (diff) | |
| download | openssh-88aa4e3d61baebe5db400000f9475f1608054b49.tar.xz openssh-88aa4e3d61baebe5db400000f9475f1608054b49.zip | |
- frantzen@@cvs.openbsd.org 2004/04/24 18:11:46
[openbsd-compat/tree.h]
sync to Niels Provos' version. avoid unused variable warning in
RB_NEXT()
Diffstat (limited to 'openbsd-compat/sys-tree.h')
| -rw-r--r-- | openbsd-compat/sys-tree.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/openbsd-compat/sys-tree.h b/openbsd-compat/sys-tree.h index c80b90b21..771248037 100644 --- a/openbsd-compat/sys-tree.h +++ b/openbsd-compat/sys-tree.h @@ -1,4 +1,4 @@ -/* $OpenBSD: tree.h,v 1.7 2002/10/17 21:51:54 art Exp $ */ +/* $OpenBSD: tree.h,v 1.8 2004/04/24 18:11:46 frantzen Exp $ */ /* * Copyright 2002 Niels Provos <provos@citi.umich.edu> * All rights reserved. @@ -381,7 +381,7 @@ void name##_RB_REMOVE_COLOR(struct name *, struct type *, struct type *);\ struct type *name##_RB_REMOVE(struct name *, struct type *); \ struct type *name##_RB_INSERT(struct name *, struct type *); \ struct type *name##_RB_FIND(struct name *, struct type *); \ -struct type *name##_RB_NEXT(struct name *, struct type *); \ +struct type *name##_RB_NEXT(struct type *); \ struct type *name##_RB_MINMAX(struct name *, int); \ \ @@ -626,7 +626,7 @@ name##_RB_FIND(struct name *head, struct type *elm) \ } \ \ struct type * \ -name##_RB_NEXT(struct name *head, struct type *elm) \ +name##_RB_NEXT(struct type *elm) \ { \ if (RB_RIGHT(elm, field)) { \ elm = RB_RIGHT(elm, field); \ @@ -667,13 +667,13 @@ name##_RB_MINMAX(struct name *head, int val) \ #define RB_INSERT(name, x, y) name##_RB_INSERT(x, y) #define RB_REMOVE(name, x, y) name##_RB_REMOVE(x, y) #define RB_FIND(name, x, y) name##_RB_FIND(x, y) -#define RB_NEXT(name, x, y) name##_RB_NEXT(x, y) +#define RB_NEXT(name, x, y) name##_RB_NEXT(y) #define RB_MIN(name, x) name##_RB_MINMAX(x, RB_NEGINF) #define RB_MAX(name, x) name##_RB_MINMAX(x, RB_INF) #define RB_FOREACH(x, name, head) \ for ((x) = RB_MIN(name, head); \ (x) != NULL; \ - (x) = name##_RB_NEXT(head, x)) + (x) = name##_RB_NEXT(x)) #endif /* _SYS_TREE_H_ */ |