Module Name: src
Committed By: christos
Date: Fri Mar 29 21:24:31 UTC 2013
Modified Files:
src/sys/sys: tree.h
Log Message:
sync with OpenBSD.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/sys/tree.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/sys/tree.h
diff -u src/sys/sys/tree.h:1.17 src/sys/sys/tree.h:1.18
--- src/sys/sys/tree.h:1.17 Fri Mar 29 16:20:22 2013
+++ src/sys/sys/tree.h Fri Mar 29 17:24:31 2013
@@ -1,5 +1,5 @@
-/* $NetBSD: tree.h,v 1.17 2013/03/29 20:20:22 christos Exp $ */
-/* $OpenBSD: tree.h,v 1.7 2002/10/17 21:51:54 art Exp $ */
+/* $NetBSD: tree.h,v 1.18 2013/03/29 21:24:31 christos Exp $ */
+/* $OpenBSD: tree.h,v 1.13 2011/07/09 00:19:45 pirofti Exp $ */
/*
* Copyright 2002 Niels Provos <pro...@citi.umich.edu>
* All rights reserved.
@@ -330,7 +330,7 @@ struct { \
} while (/*CONSTCOND*/ 0)
#ifndef RB_AUGMENT
-#define RB_AUGMENT(x) (void)(x)
+#define RB_AUGMENT(x) do {} while (/*CONSTCOND*/ 0)
#endif
#define RB_ROTATE_LEFT(head, elm, tmp, field) do { \
