From owner-svn-src-all@FreeBSD.ORG Sat Apr 5 08:17:49 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8D9C2EAF; Sat, 5 Apr 2014 08:17:49 +0000 (UTC) Received: from svn.freebsd.org (svn.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 60519EBB; Sat, 5 Apr 2014 08:17:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s358HnGV070941; Sat, 5 Apr 2014 08:17:49 GMT (envelope-from theraven@svn.freebsd.org) Received: (from theraven@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s358HmsL070938; Sat, 5 Apr 2014 08:17:48 GMT (envelope-from theraven@svn.freebsd.org) Message-Id: <201404050817.s358HmsL070938@svn.freebsd.org> From: David Chisnall Date: Sat, 5 Apr 2014 08:17:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r264143 - 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-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Apr 2014 08:17:49 -0000 Author: theraven Date: Sat Apr 5 08:17:48 2014 New Revision: 264143 URL: http://svnweb.freebsd.org/changeset/base/264143 Log: Silence a warning with GCC that was breaking the build with Juniper's GCC. Reviewed by: marcel Modified: head/lib/libc/stdlib/atexit.c head/lib/libc/stdlib/heapsort.c head/lib/libc/stdlib/qsort_r.c Modified: head/lib/libc/stdlib/atexit.c ============================================================================== --- head/lib/libc/stdlib/atexit.c Sat Apr 5 03:01:29 2014 (r264142) +++ head/lib/libc/stdlib/atexit.c Sat Apr 5 08:17:48 2014 (r264143) @@ -80,6 +80,7 @@ struct atexit { }; static struct atexit *__atexit; /* points to head of LIFO stack */ +typedef DECLARE_BLOCK(void, atexit_block, void); /* * Register the function described by 'fptr' to be called at application @@ -141,7 +142,7 @@ atexit(void (*func)(void)) * Register a block to be performed at exit. */ int -atexit_b(DECLARE_BLOCK(void, func, void)) +atexit_b(atexit_block func) { struct atexit_fn fn; int error; Modified: head/lib/libc/stdlib/heapsort.c ============================================================================== --- head/lib/libc/stdlib/heapsort.c Sat Apr 5 03:01:29 2014 (r264142) +++ head/lib/libc/stdlib/heapsort.c Sat Apr 5 08:17:48 2014 (r264143) @@ -45,6 +45,7 @@ __FBSDID("$FreeBSD$"); #ifdef I_AM_HEAPSORT_B #include "block_abi.h" #define COMPAR(x, y) CALL_BLOCK(compar, x, y) +typedef DECLARE_BLOCK(int, heapsort_block, const void *, const void *); #else #define COMPAR(x, y) compar(x, y) #endif @@ -149,7 +150,7 @@ int heapsort_b(vbase, nmemb, size, compar) void *vbase; size_t nmemb, size; - DECLARE_BLOCK(int, compar, const void *, const void *); + heapsort_block compar; #else int heapsort(vbase, nmemb, size, compar) Modified: head/lib/libc/stdlib/qsort_r.c ============================================================================== --- head/lib/libc/stdlib/qsort_r.c Sat Apr 5 03:01:29 2014 (r264142) +++ head/lib/libc/stdlib/qsort_r.c Sat Apr 5 08:17:48 2014 (r264143) @@ -8,9 +8,10 @@ #define I_AM_QSORT_R #include "qsort.c" +typedef DECLARE_BLOCK(int, qsort_block, const void *, const void *); + void -qsort_b(void *base, size_t nel, size_t width, - DECLARE_BLOCK(int, compar, const void *, const void *)) +qsort_b(void *base, size_t nel, size_t width, qsort_block compar) { qsort_r(base, nel, width, compar, (int (*)(void *, const void *, const void *))