From 3a55871d0427b45713d56938202a3e2265a428c1 Mon Sep 17 00:00:00 2001
From: Nicholas Marriott <nicholas.marriott@gmail.com>
Date: Tue, 26 May 2009 18:31:10 +0000
Subject: [PATCH] Now in base.

---
 compat/tree.h | 6 +++---
 tmux.h        | 5 +----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/compat/tree.h b/compat/tree.h
index 853a9a9b..0f480e3e 100644
--- a/compat/tree.h
+++ b/compat/tree.h
@@ -1,5 +1,5 @@
-/* $Id: tree.h,v 1.3 2009-04-29 22:45:32 nicm Exp $ */
-/*	$OpenBSD: tree.h,v 1.11 2008/05/11 22:19:09 millert Exp $	*/
+/* $Id: tree.h,v 1.4 2009-05-26 18:31:10 nicm Exp $ */
+/*	$OpenBSD: tree.h,v 1.12 2009/03/02 09:42:55 mikeb Exp $	*/
 /*
  * Copyright 2002 Niels Provos <provos@citi.umich.edu>
  * All rights reserved.
@@ -330,7 +330,7 @@ struct {								\
 } while (0)
 
 #ifndef RB_AUGMENT
-#define RB_AUGMENT(x)
+#define RB_AUGMENT(x)	do {} while (0)
 #endif
 
 #define RB_ROTATE_LEFT(head, elm, tmp, field) do {			\
diff --git a/tmux.h b/tmux.h
index 1ac668fe..99d11541 100644
--- a/tmux.h
+++ b/tmux.h
@@ -1,4 +1,4 @@
-/* $Id: tmux.h,v 1.326 2009-05-21 19:46:00 nicm Exp $ */
+/* $Id: tmux.h,v 1.327 2009-05-26 18:31:10 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -23,9 +23,6 @@
 
 #define PROTOCOL_VERSION -13
 
-/* Shut up gcc warnings about empty if bodies. */
-#define RB_AUGMENT(x) do {} while (0)
-
 #include <sys/param.h>
 #include <sys/time.h>