From 5cc02420dc254c5d8599c9639157634057a92db2 Mon Sep 17 00:00:00 2001
From: John Marino <draco@marino.st>
Date: Wed, 2 Sep 2015 22:24:54 +0200
Subject: [PATCH] lib/libc/stdlib/merge.c: add "static" to match setup
 prototype

---
 lib/libc/stdlib/merge.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/libc/stdlib/merge.c b/lib/libc/stdlib/merge.c
index e8118cc6b7..c76e9094d7 100644
--- a/lib/libc/stdlib/merge.c
+++ b/lib/libc/stdlib/merge.c
@@ -253,7 +253,7 @@ COPY:	    			b = t;
  * when THRESHOLD/2 pairs compare with same sense.  (Only used when NATURAL
  * is defined.  Otherwise simple pairwise merging is used.)
  */
-void
+static void
 setup(u_char *list1, u_char *list2, size_t n, size_t size,
       int (*cmp)(const void *, const void *))
 {
-- 
2.41.0