diff options
-rw-r--r-- | ChangeLog | 9 | ||||
-rw-r--r-- | openbsd-compat/sys-tree.h | 4 |
2 files changed, 8 insertions, 5 deletions
@@ -87,10 +87,13 @@ | |||
87 | [openbsd-compat/base64.c] | 87 | [openbsd-compat/base64.c] |
88 | remove calls to abort(3) that can't happen anyway; from | 88 | remove calls to abort(3) that can't happen anyway; from |
89 | <bret dot lambert at gmail.com>; ok millert@ deraadt@ | 89 | <bret dot lambert at gmail.com>; ok millert@ deraadt@ |
90 | - frantzen@@cvs.openbsd.org 2004/04/24 18:11:46 | 90 | - frantzen@cvs.openbsd.org 2004/04/24 18:11:46 |
91 | [openbsd-compat/tree.h] | 91 | [openbsd-compat/sys-tree.h] |
92 | sync to Niels Provos' version. avoid unused variable warning in | 92 | sync to Niels Provos' version. avoid unused variable warning in |
93 | RB_NEXT() | 93 | RB_NEXT() |
94 | - tdeval@cvs.openbsd.org 2004/11/24 18:10:42 | ||
95 | [openbsd-compat/sys-tree.h] | ||
96 | typo | ||
94 | - (djm) [regress/sftp-cmds.sh] | 97 | - (djm) [regress/sftp-cmds.sh] |
95 | Use more restrictive glob to pick up test files from /bin - some platforms | 98 | Use more restrictive glob to pick up test files from /bin - some platforms |
96 | ship broken symlinks there which could spoil the test. | 99 | ship broken symlinks there which could spoil the test. |
@@ -3367,4 +3370,4 @@ | |||
3367 | OpenServer 6 and add osr5bigcrypt support so when someone migrates | 3370 | OpenServer 6 and add osr5bigcrypt support so when someone migrates |
3368 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ | 3371 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ |
3369 | 3372 | ||
3370 | $Id: ChangeLog,v 1.4784 2007/10/26 06:37:43 djm Exp $ | 3373 | $Id: ChangeLog,v 1.4785 2007/10/26 06:39:05 djm Exp $ |
diff --git a/openbsd-compat/sys-tree.h b/openbsd-compat/sys-tree.h index 771248037..6b777d9f3 100644 --- a/openbsd-compat/sys-tree.h +++ b/openbsd-compat/sys-tree.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: tree.h,v 1.8 2004/04/24 18:11:46 frantzen Exp $ */ | 1 | /* $OpenBSD: tree.h,v 1.9 2004/11/24 18:10:42 tdeval Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright 2002 Niels Provos <provos@citi.umich.edu> | 3 | * Copyright 2002 Niels Provos <provos@citi.umich.edu> |
4 | * All rights reserved. | 4 | * All rights reserved. |
@@ -289,7 +289,7 @@ void name##_SPLAY_MINMAX(struct name *head, int __comp) \ | |||
289 | (x) != NULL; \ | 289 | (x) != NULL; \ |
290 | (x) = SPLAY_NEXT(name, head, x)) | 290 | (x) = SPLAY_NEXT(name, head, x)) |
291 | 291 | ||
292 | /* Macros that define a red-back tree */ | 292 | /* Macros that define a red-black tree */ |
293 | #define RB_HEAD(name, type) \ | 293 | #define RB_HEAD(name, type) \ |
294 | struct name { \ | 294 | struct name { \ |
295 | struct type *rbh_root; /* root of the tree */ \ | 295 | struct type *rbh_root; /* root of the tree */ \ |