X-Git-Url: https://git.saurik.com/apple/libc.git/blobdiff_plain/34e8f8296870d0e8695f90e1a54240a589d41312..aa54d2fad3d9038b43475aa93c76795c5141a993:/stdlib/FreeBSD/merge.c

diff --git a/stdlib/FreeBSD/merge.c b/stdlib/FreeBSD/merge.c
index 82acb0a..6a93bc1 100644
--- a/stdlib/FreeBSD/merge.c
+++ b/stdlib/FreeBSD/merge.c
@@ -30,6 +30,9 @@
  * SUCH DAMAGE.
  */
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wcomma"
+
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)merge.c	8.2 (Berkeley) 2/14/94";
 #endif /* LIBC_SCCS and not lint */
@@ -264,7 +267,8 @@ setup(list1, list2, n, size, cmp)
 	int (*cmp)(const void *, const void *);
 	u_char *list1, *list2;
 {
-	int i, length, size2, tmp, sense;
+	size_t i, size2;
+	int length, tmp, sense;
 	u_char *f1, *f2, *s, *l2, *last, *p2;
 
 	size2 = size*2;
@@ -349,3 +353,4 @@ insertionsort(a, n, size, cmp)
 			swap(u, t);
 		}
 }
+#pragma clang diagnostic pop