From e6d152794949c1e552e154aef6c74ef867991a9b Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Tue, 30 Oct 2007 10:52:44 +1100 Subject: [PATCH] - djm@cvs.openbsd.org 2007/10/29 23:49:41 [openbsd-compat/sys-tree.h] remove extra backslash at the end of RB_PROTOTYPE, report from Jan.Pechanec AT Sun.COM; ok deraadt@ --- ChangeLog | 9 ++++++++- openbsd-compat/sys-tree.h | 6 +++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index dbae4398e..2bf6d6d6b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +20071030 + - (djm) OpenBSD CVS Sync + - djm@cvs.openbsd.org 2007/10/29 23:49:41 + [openbsd-compat/sys-tree.h] + remove extra backslash at the end of RB_PROTOTYPE, report from + Jan.Pechanec AT Sun.COM; ok deraadt@ + 20071026 - (djm) OpenBSD CVS Sync - stevesk@cvs.openbsd.org 2007/09/11 23:49:09 @@ -3407,4 +3414,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.4793 2007/10/26 06:48:13 djm Exp $ +$Id: ChangeLog,v 1.4794 2007/10/29 23:52:44 djm Exp $ diff --git a/openbsd-compat/sys-tree.h b/openbsd-compat/sys-tree.h index 6b777d9f3..d4949b5e7 100644 --- a/openbsd-compat/sys-tree.h +++ b/openbsd-compat/sys-tree.h @@ -1,4 +1,4 @@ -/* $OpenBSD: tree.h,v 1.9 2004/11/24 18:10:42 tdeval Exp $ */ +/* $OpenBSD: tree.h,v 1.10 2007/10/29 23:49:41 djm Exp $ */ /* * Copyright 2002 Niels Provos * All rights reserved. @@ -382,8 +382,8 @@ 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 type *); \ -struct type *name##_RB_MINMAX(struct name *, int); \ - \ +struct type *name##_RB_MINMAX(struct name *, int); + /* Main rb operation. * Moves node close to the key of elm to top