From 0afeae426c7251877dfcfc6d8124ad5edc009557 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Fri, 26 Oct 2007 16:39:05 +1000 Subject: [PATCH] - tdeval@cvs.openbsd.org 2004/11/24 18:10:42 [openbsd-compat/sys-tree.h] typo --- ChangeLog | 9 ++++++--- openbsd-compat/sys-tree.h | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 395b0accc..d061c4de5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -87,10 +87,13 @@ [openbsd-compat/base64.c] remove calls to abort(3) that can't happen anyway; from ; ok millert@ deraadt@ - - frantzen@@cvs.openbsd.org 2004/04/24 18:11:46 - [openbsd-compat/tree.h] + - frantzen@cvs.openbsd.org 2004/04/24 18:11:46 + [openbsd-compat/sys-tree.h] sync to Niels Provos' version. avoid unused variable warning in RB_NEXT() + - tdeval@cvs.openbsd.org 2004/11/24 18:10:42 + [openbsd-compat/sys-tree.h] + typo - (djm) [regress/sftp-cmds.sh] Use more restrictive glob to pick up test files from /bin - some platforms ship broken symlinks there which could spoil the test. @@ -3367,4 +3370,4 @@ OpenServer 6 and add osr5bigcrypt support so when someone migrates passwords between UnixWare and OpenServer they will still work. OK dtucker@ -$Id: ChangeLog,v 1.4784 2007/10/26 06:37:43 djm Exp $ +$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 @@ -/* $OpenBSD: tree.h,v 1.8 2004/04/24 18:11:46 frantzen Exp $ */ +/* $OpenBSD: tree.h,v 1.9 2004/11/24 18:10:42 tdeval Exp $ */ /* * Copyright 2002 Niels Provos * All rights reserved. @@ -289,7 +289,7 @@ void name##_SPLAY_MINMAX(struct name *head, int __comp) \ (x) != NULL; \ (x) = SPLAY_NEXT(name, head, x)) -/* Macros that define a red-back tree */ +/* Macros that define a red-black tree */ #define RB_HEAD(name, type) \ struct name { \ struct type *rbh_root; /* root of the tree */ \