From nobody Wed Mar 06 19:46:19 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Tqjbv2LLXz5DBmW; Wed, 6 Mar 2024 19:46:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tqjbv1kXbz49jP; Wed, 6 Mar 2024 19:46:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709754379; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=F+2wTOcLfIie3MnBenfJzhIDkMYVMOC9/5zB5gHdexs=; b=IMK5z/eGGydvM6q3ujtRCmEvymyPei83mpsU6WLrhdPY0WMBq1BEba9ibByh3pnAgTDEmJ 29qbHLPuC3OwQWLemP+Ar5Ey078XyYb9G2/lCRTkVFhlDjcNH1D4dyY67Agr0H9SRG+399 sturgCqX/cuNGh0jsU3rd7s0z6v97r3O0UPOy0BkfdPiYuMmp2Pe6XNn9bE1zhmKQWIRha ht3GAEFi4+mSitrfylKEDko95YW9xIzV6BFmHMUAnZ1glzFWXWMdhV5gUjT3uEVGGzT7oS JjkUWTZ9TOePf3q1F5YZAJrligWjo1bQIqpvWGepSsT4LpMqVY95qVtbB9u3KA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709754379; a=rsa-sha256; cv=none; b=VWQL7LoEjht6jvA+FDwzfb9bztszmPvLdGQtLIeqxYwAzgrdDBum+7IH0wge8EbAQ312Tg 0IfStuceFBDzWOV1lItra5NHxKz6DJpL/BmddLxUfpH9sYGsL1Y5ViceEOIai7Jowx4ITs OkMJixOFtUMi1aTPVEuxrPs8eCCYxrNZYl22dZmNC2xuQNpe/Olgzty2kAfizTI75DF0JK +m4WV7pe+TzJwYrVKWPnPaY5AM7G/GccHzQWljz4HrAr1wNJxqQJgtQgTg0/8EdYOC9RMd E6Dr0oDhHnxB8o/K3kPQJFiaocyAO/X+ZicYVac0f06AHudDRO/ndL/3ny4zkg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709754379; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=F+2wTOcLfIie3MnBenfJzhIDkMYVMOC9/5zB5gHdexs=; b=rij1c4ZfdLzghCuM16JwlsAtP7qzM0cXWu7ZwCzE1tmKI4r2wUR5rWsMK3hmqKSYYJvQz/ IVQlmhG5WfKAEjdUMfw9/6BcihjgQTD/K/7KFDSKZAk0ydC3/2JHvajpn0g2ICRQeibmcH A+2EQg5QwR/RqzKRS0Pv3hesgXd1pD6qSugcTeaaBkp5qNrwjqrZhDKHotwRmtjb1uy6lg no1PzS6HG5aneqagr7/w6v+eCjdTTE7vg6T3lrpny1lJrvutoUcUF05LoQkXvKdVoZUtHr 5/UTqO8c9pKTVIv5Hw4N3Af6x9SQE+i62alJBRVStgkpXq1x55Xftn/vkH/oBw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Tqjbv1CFwz13Zy; Wed, 6 Mar 2024 19:46:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 426JkJQJ063595; Wed, 6 Mar 2024 19:46:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 426JkJDN063592; Wed, 6 Mar 2024 19:46:19 GMT (envelope-from git) Date: Wed, 6 Mar 2024 19:46:19 GMT Message-Id: <202403061946.426JkJDN063592@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 8c94ed992702 - main - bsearch_b: fix compilation with gcc List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8c94ed99270292262073b7bd103a29de69b5ae38 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=8c94ed99270292262073b7bd103a29de69b5ae38 commit 8c94ed99270292262073b7bd103a29de69b5ae38 Author: Brooks Davis AuthorDate: 2024-03-06 19:45:40 +0000 Commit: Brooks Davis CommitDate: 2024-03-06 19:46:12 +0000 bsearch_b: fix compilation with gcc Reported by: rscheff Differential Revision: https://reviews.freebsd.org/D44256 --- lib/libc/stdlib/bsearch.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/libc/stdlib/bsearch.c b/lib/libc/stdlib/bsearch.c index 055becf1c85b..96c728e1c997 100644 --- a/lib/libc/stdlib/bsearch.c +++ b/lib/libc/stdlib/bsearch.c @@ -35,6 +35,7 @@ #ifdef I_AM_BSEARCH_B #include "block_abi.h" #define COMPAR(x,y) CALL_BLOCK(compar, x, y) +typedef DECLARE_BLOCK(int, compar_block, const void *, const void *); #else #define COMPAR(x,y) compar(x, y) #endif @@ -58,7 +59,7 @@ #ifdef I_AM_BSEARCH_B void * bsearch_b(const void *key, const void *base0, size_t nmemb, size_t size, - DECLARE_BLOCK(int, compar, const void *, const void *)) + compar_block compar) #else void * bsearch(const void *key, const void *base0, size_t nmemb, size_t size,