summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2007-10-30 10:52:44 +1100
committerDamien Miller <djm@mindrot.org>2007-10-30 10:52:44 +1100
commite6d152794949c1e552e154aef6c74ef867991a9b (patch)
tree63c3d3bc9cf4f09528eb08a1e76e8eb230dfd315
parent0ff80a1b17ab5c804fc123f79ed59df2559884bb (diff)
- 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@
-rw-r--r--ChangeLog9
-rw-r--r--openbsd-compat/sys-tree.h6
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 @@
120071030
2 - (djm) OpenBSD CVS Sync
3 - djm@cvs.openbsd.org 2007/10/29 23:49:41
4 [openbsd-compat/sys-tree.h]
5 remove extra backslash at the end of RB_PROTOTYPE, report from
6 Jan.Pechanec AT Sun.COM; ok deraadt@
7
120071026 820071026
2 - (djm) OpenBSD CVS Sync 9 - (djm) OpenBSD CVS Sync
3 - stevesk@cvs.openbsd.org 2007/09/11 23:49:09 10 - stevesk@cvs.openbsd.org 2007/09/11 23:49:09
@@ -3407,4 +3414,4 @@
3407 OpenServer 6 and add osr5bigcrypt support so when someone migrates 3414 OpenServer 6 and add osr5bigcrypt support so when someone migrates
3408 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 3415 passwords between UnixWare and OpenServer they will still work. OK dtucker@
3409 3416
3410$Id: ChangeLog,v 1.4793 2007/10/26 06:48:13 djm Exp $ 3417$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 @@
1/* $OpenBSD: tree.h,v 1.9 2004/11/24 18:10:42 tdeval Exp $ */ 1/* $OpenBSD: tree.h,v 1.10 2007/10/29 23:49:41 djm 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.
@@ -382,8 +382,8 @@ struct type *name##_RB_REMOVE(struct name *, struct type *); \
382struct type *name##_RB_INSERT(struct name *, struct type *); \ 382struct type *name##_RB_INSERT(struct name *, struct type *); \
383struct type *name##_RB_FIND(struct name *, struct type *); \ 383struct type *name##_RB_FIND(struct name *, struct type *); \
384struct type *name##_RB_NEXT(struct type *); \ 384struct type *name##_RB_NEXT(struct type *); \
385struct type *name##_RB_MINMAX(struct name *, int); \ 385struct type *name##_RB_MINMAX(struct name *, int);
386 \ 386
387 387
388/* Main rb operation. 388/* Main rb operation.
389 * Moves node close to the key of elm to top 389 * Moves node close to the key of elm to top