From owner-svn-src-head@freebsd.org Sun Sep 20 03:53:10 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2C0079CD9A5; Sun, 20 Sep 2015 03:53:10 +0000 (UTC) (envelope-from rodrigc@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0248C117E; Sun, 20 Sep 2015 03:53:10 +0000 (UTC) (envelope-from rodrigc@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8K3r9lK067927; Sun, 20 Sep 2015 03:53:09 GMT (envelope-from rodrigc@FreeBSD.org) Received: (from rodrigc@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8K3r9bb067924; Sun, 20 Sep 2015 03:53:09 GMT (envelope-from rodrigc@FreeBSD.org) Message-Id: <201509200353.t8K3r9bb067924@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rodrigc set sender to rodrigc@FreeBSD.org using -f From: Craig Rodrigues Date: Sun, 20 Sep 2015 03:53:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r288005 - head/lib/libc/stdlib X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Sep 2015 03:53:10 -0000 Author: rodrigc Date: Sun Sep 20 03:53:08 2015 New Revision: 288005 URL: https://svnweb.freebsd.org/changeset/base/288005 Log: Add declarations to eliminate -Wmissing-prototypes warnings. Modified: head/lib/libc/stdlib/atexit.c head/lib/libc/stdlib/heapsort.c head/lib/libc/stdlib/merge.c Modified: head/lib/libc/stdlib/atexit.c ============================================================================== --- head/lib/libc/stdlib/atexit.c Sun Sep 20 03:51:15 2015 (r288004) +++ head/lib/libc/stdlib/atexit.c Sun Sep 20 03:53:08 2015 (r288005) @@ -82,6 +82,9 @@ struct atexit { static struct atexit *__atexit; /* points to head of LIFO stack */ typedef DECLARE_BLOCK(void, atexit_block, void); +int atexit_b(atexit_block func); +int __cxa_atexit(void (*func)(void *), void *arg, void *dso); + /* * Register the function described by 'fptr' to be called at application * exit or owning shared object unload time. This is a helper function Modified: head/lib/libc/stdlib/heapsort.c ============================================================================== --- head/lib/libc/stdlib/heapsort.c Sun Sep 20 03:51:15 2015 (r288004) +++ head/lib/libc/stdlib/heapsort.c Sun Sep 20 03:53:08 2015 (r288005) @@ -138,6 +138,12 @@ typedef DECLARE_BLOCK(int, heapsort_bloc } \ } +#ifdef I_AM_HEAPSORT_B +int heapsort_b(void *vbase, size_t nmemb, size_t size, heapsort_block compar); +#else +int heapsort(void *vbase, size_t nmemb, size_t size, + int (*compar)(const void *, const void *)); +#endif /* * Heapsort -- Knuth, Vol. 3, page 145. Runs in O (N lg N), both average * and worst. While heapsort is faster than the worst case of quicksort, Modified: head/lib/libc/stdlib/merge.c ============================================================================== --- head/lib/libc/stdlib/merge.c Sun Sep 20 03:51:15 2015 (r288004) +++ head/lib/libc/stdlib/merge.c Sun Sep 20 03:53:08 2015 (r288005) @@ -99,6 +99,12 @@ static void insertionsort(u_char *, size ((u_char *)0 + \ (((u_char *)p + PSIZE - 1 - (u_char *) 0) & ~(PSIZE - 1))) +#ifdef I_AM_MERGESORT_B +int mergesort_b(void *base, size_t nmemb, size_t size, cmp_t cmp); +#else +int mergesort(void *base, size_t nmemb, size_t size, cmp_t cmp); +#endif + /* * Arguments are as for qsort. */