diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | openbsd-compat/sys-queue.h | 8 |
2 files changed, 8 insertions, 5 deletions
@@ -99,6 +99,9 @@ | |||
99 | Remove useless ``elm'' argument from the SIMPLEQ_REMOVE_HEAD macro. | 99 | Remove useless ``elm'' argument from the SIMPLEQ_REMOVE_HEAD macro. |
100 | This matches our SLIST behaviour and NetBSD's SIMPLEQ as well. | 100 | This matches our SLIST behaviour and NetBSD's SIMPLEQ as well. |
101 | ok millert krw deraadt | 101 | ok millert krw deraadt |
102 | - deraadt@cvs.openbsd.org 2005/02/25 13:29:30 | ||
103 | [openbsd-compat/sys-queue.h] | ||
104 | minor white spacing | ||
102 | - (djm) [regress/sftp-cmds.sh] | 105 | - (djm) [regress/sftp-cmds.sh] |
103 | Use more restrictive glob to pick up test files from /bin - some platforms | 106 | Use more restrictive glob to pick up test files from /bin - some platforms |
104 | ship broken symlinks there which could spoil the test. | 107 | ship broken symlinks there which could spoil the test. |
@@ -3375,4 +3378,4 @@ | |||
3375 | OpenServer 6 and add osr5bigcrypt support so when someone migrates | 3378 | OpenServer 6 and add osr5bigcrypt support so when someone migrates |
3376 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ | 3379 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ |
3377 | 3380 | ||
3378 | $Id: ChangeLog,v 1.4786 2007/10/26 06:40:20 djm Exp $ | 3381 | $Id: ChangeLog,v 1.4787 2007/10/26 06:41:14 djm Exp $ |
diff --git a/openbsd-compat/sys-queue.h b/openbsd-compat/sys-queue.h index 71eec0e8c..61e4ca7b0 100644 --- a/openbsd-compat/sys-queue.h +++ b/openbsd-compat/sys-queue.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: queue.h,v 1.26 2004/05/04 16:59:32 grange Exp $ */ | 1 | /* $OpenBSD: queue.h,v 1.27 2005/02/25 13:29:30 deraadt Exp $ */ |
2 | /* $NetBSD: queue.h,v 1.11 1996/05/16 05:17:14 mycroft Exp $ */ | 2 | /* $NetBSD: queue.h,v 1.11 1996/05/16 05:17:14 mycroft Exp $ */ |
3 | 3 | ||
4 | /* | 4 | /* |
@@ -229,10 +229,10 @@ struct { \ | |||
229 | #define SLIST_REMOVE(head, elm, type, field) do { \ | 229 | #define SLIST_REMOVE(head, elm, type, field) do { \ |
230 | if ((head)->slh_first == (elm)) { \ | 230 | if ((head)->slh_first == (elm)) { \ |
231 | SLIST_REMOVE_HEAD((head), field); \ | 231 | SLIST_REMOVE_HEAD((head), field); \ |
232 | } \ | 232 | } else { \ |
233 | else { \ | ||
234 | struct type *curelm = (head)->slh_first; \ | 233 | struct type *curelm = (head)->slh_first; \ |
235 | while( curelm->field.sle_next != (elm) ) \ | 234 | \ |
235 | while (curelm->field.sle_next != (elm)) \ | ||
236 | curelm = curelm->field.sle_next; \ | 236 | curelm = curelm->field.sle_next; \ |
237 | curelm->field.sle_next = \ | 237 | curelm->field.sle_next = \ |
238 | curelm->field.sle_next->field.sle_next; \ | 238 | curelm->field.sle_next->field.sle_next; \ |