Merge branch 'obsd-master'

Conflicts:
	format.c
	osdep-openbsd.c

1 files changed, 1 insertions, 2 deletions

diff --git a/options.c b/options.c
index cd3bd8ec..845bd7d5 100644
--- a/options.c
+++ b/options.c
@@ -35,8 +35,7 @@ struct options {
 };
 
 static int	options_cmp(struct options_entry *, struct options_entry *);
-RB_PROTOTYPE(options_tree, options_entry, entry, options_cmp);
-RB_GENERATE(options_tree, options_entry, entry, options_cmp);
+RB_GENERATE_STATIC(options_tree, options_entry, entry, options_cmp);
 
 static void	options_free1(struct options *, struct options_entry *);