[apple/libc.git] / stdlib / FreeBSD / merge.c.patch

--- merge.c.orig	2008-02-17 16:11:51.000000000 -0800
+++ merge.c	2008-02-17 20:26:24.000000000 -0800
@@ -264,7 +264,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;
Commit	Line	Data
34e8f829 A	1	--- merge.c.orig 2008-02-17 16:11:51.000000000 -0800
	2	+++ merge.c 2008-02-17 20:26:24.000000000 -0800
	3	@@ -264,7 +264,8 @@ setup(list1, list2, n, size, cmp)
	4	int (cmp)(const void , const void *);
	5	u_char list1, list2;
	6	{
	7	- int i, length, size2, tmp, sense;
	8	+ size_t i, size2;
	9	+ int length, tmp, sense;
	10	u_char f1, f2, s, l2, last, p2;
	11
	12	size2 = size*2;