mirror of
				https://github.com/tmux/tmux.git
				synced 2025-11-04 00:56:10 +00:00 
			
		
		
		
	Sync OpenBSD tree.h due to patchset 1104.
Prompted by ore on #tmux.
This commit is contained in:
		@@ -1,5 +1,5 @@
 | 
			
		||||
/* $Id$ */
 | 
			
		||||
/*	$OpenBSD: tree.h,v 1.12 2009/03/02 09:42:55 mikeb Exp $	*/
 | 
			
		||||
/*	$OpenBSD: tree.h,v 1.13 2011/07/09 00:19:45 pirofti Exp $	*/
 | 
			
		||||
/*
 | 
			
		||||
 * Copyright 2002 Niels Provos <provos@citi.umich.edu>
 | 
			
		||||
 * All rights reserved.
 | 
			
		||||
@@ -84,7 +84,7 @@ struct {								\
 | 
			
		||||
	SPLAY_RIGHT(tmp, field) = (head)->sph_root;			\
 | 
			
		||||
	(head)->sph_root = tmp;						\
 | 
			
		||||
} while (0)
 | 
			
		||||
 | 
			
		||||
	
 | 
			
		||||
#define SPLAY_ROTATE_LEFT(head, tmp, field) do {			\
 | 
			
		||||
	SPLAY_RIGHT((head)->sph_root, field) = SPLAY_LEFT(tmp, field);	\
 | 
			
		||||
	SPLAY_LEFT(tmp, field) = (head)->sph_root;			\
 | 
			
		||||
@@ -731,9 +731,19 @@ name##_RB_MINMAX(struct name *head, int val)				\
 | 
			
		||||
	     (x) != NULL;						\
 | 
			
		||||
	     (x) = name##_RB_NEXT(x))
 | 
			
		||||
 | 
			
		||||
#define RB_FOREACH_SAFE(x, name, head, y)				\
 | 
			
		||||
	for ((x) = RB_MIN(name, head);					\
 | 
			
		||||
	    ((x) != NULL) && ((y) = name##_RB_NEXT(x), 1);		\
 | 
			
		||||
	     (x) = (y))
 | 
			
		||||
 | 
			
		||||
#define RB_FOREACH_REVERSE(x, name, head)				\
 | 
			
		||||
	for ((x) = RB_MAX(name, head);					\
 | 
			
		||||
	     (x) != NULL;						\
 | 
			
		||||
	     (x) = name##_RB_PREV(x))
 | 
			
		||||
 | 
			
		||||
#define RB_FOREACH_REVERSE_SAFE(x, name, head, y)			\
 | 
			
		||||
	for ((x) = RB_MAX(name, head);					\
 | 
			
		||||
	    ((x) != NULL) && ((y) = name##_RB_PREV(x), 1);		\
 | 
			
		||||
	     (x) = (y))
 | 
			
		||||
 | 
			
		||||
#endif	/* _SYS_TREE_H_ */
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user