Libc-1353.100.2.tar.gz

[apple/libc.git] / stdlib / FreeBSD / heapsort.c

diff --git a/stdlib/FreeBSD/heapsort.c b/stdlib/FreeBSD/heapsort.c
index e846be2a8380e013bbbf0f3da2a9097ab7d3947c..c41865b24421c4e6fe2064af2fc8ec9f7b716fc9 100644 (file)
--- a/stdlib/FreeBSD/heapsort.c
+++ b/stdlib/FreeBSD/heapsort.c
@@ -13,10 +13,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
@@ -34,11 +30,14 @@
  * SUCH DAMAGE.
  */
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wstrict-prototypes"
+
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)heapsort.c 8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/heapsort.c,v 1.4 2002/03/21 22:48:41 obrien Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/heapsort.c,v 1.6 2008/01/13 02:11:10 das Exp $");
 
 #include <errno.h>
 #include <stddef.h>
@@ -145,7 +144,7 @@ heapsort(vbase, nmemb, size, compar)
        size_t nmemb, size;
        int (*compar)(const void *, const void *);
 {
-       int cnt, i, j, l;
+       size_t cnt, i, j, l;
        char tmp, *tmp1, *tmp2;
        char *base, *k, *p, *t;
 
@@ -183,3 +182,4 @@ heapsort(vbase, nmemb, size, compar)
        free(k);
        return (0);
 }
+#pragma clang diagnostic pop