Merge branch 'obsd-master'

Conflicts:
	format.c
	osdep-openbsd.c

1 files changed, 2 insertions, 2 deletions

diff --git a/paste.c b/paste.c
index bc2f5c88..cf3e3cdc 100644
--- a/paste.c
+++ b/paste.c
@@ -45,8 +45,8 @@ struct paste_buffer {
 static u_int	paste_next_index;
 static u_int	paste_next_order;
 static u_int	paste_num_automatic;
-RB_HEAD(paste_name_tree, paste_buffer) paste_by_name;
-RB_HEAD(paste_time_tree, paste_buffer) paste_by_time;
+static RB_HEAD(paste_name_tree, paste_buffer) paste_by_name;
+static RB_HEAD(paste_time_tree, paste_buffer) paste_by_time;
 
 static int	paste_cmp_names(const struct paste_buffer *,
 		    const struct paste_buffer *);