Merge branch 'obsd-master'

Conflicts:
	format.c
	osdep-openbsd.c

1 files changed, 3 insertions, 4 deletions

diff --git a/environ.c b/environ.c
index 5d06afbf..016d256a 100644
--- a/environ.c
+++ b/environ.c
@@ -28,11 +28,10 @@
  */
 
 RB_HEAD(environ, environ_entry);
-int	environ_cmp(struct environ_entry *, struct environ_entry *);
-RB_PROTOTYPE(environ, environ_entry, entry, environ_cmp);
-RB_GENERATE(environ, environ_entry, entry, environ_cmp);
+static int environ_cmp(struct environ_entry *, struct environ_entry *);
+RB_GENERATE_STATIC(environ, environ_entry, entry, environ_cmp);
 
-int
+static int
 environ_cmp(struct environ_entry *envent1, struct environ_entry *envent2)
 {
 	return (strcmp(envent1->name, envent2->name));