From nobody Fri Dec 24 13:02:08 2021 X-Original-To: dev-commits-src-branches@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 1C9FD191218F; Fri, 24 Dec 2021 13:02:09 +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 4JL6f865t1z3k9p; Fri, 24 Dec 2021 13:02:08 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 B2756247B5; Fri, 24 Dec 2021 13:02:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BOD289l079076; Fri, 24 Dec 2021 13:02:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BOD28iL079075; Fri, 24 Dec 2021 13:02:08 GMT (envelope-from git) Date: Fri, 24 Dec 2021 13:02:08 GMT Message-Id: <202112241302.1BOD28iL079075@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 4d098982ac55 - stable/12 - Fix gcc gperf prototypes to avoid redeclaration errors, again List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 4d098982ac55cda66c18cae18c6cf6624d9aa746 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640350928; 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=6vqsngVRqY3j9BZ0Rryl+DrC5uoB1LyKg8zvFqV6Zew=; b=G69XwYQtct3QSqRu0bPIwcXhac6p5z8Xl5wYBzptoB+REc4X+2y6lQYXUJLcfeE9XEPjpq Ao/7OxSelipQ1R3DhCfz0IFXP6nstkk4kb1kSlsl9Z/CNUiXVpSp0bIjZqWpCpjRA1njCz L9k9eMHDGSp31PGGlFOfeDHrH14x4am7d/TmT1KO+lyVzRdD5tWggZ2M2O5aelWIPLFyV8 nyCrmTG0x+EtRE+XCaItHqcSSgNix4hP/kpmL5sjCObnanVBiBWcw+Hcq061cakc6X/ilc RpMoabd2+p1oh2+oduxH3E48Br19vqIM0/Di28FNzZqsZTlRSW0hJ152rVzohQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640350928; a=rsa-sha256; cv=none; b=iGzE6VPozwesePIQjZmLD587YWEGPeynylqNwt826x/lCoE/Iys0XPn9nBh07GMdqZYsD1 4VTHS06s/ndEdOef6dAOmp5rE8RudUPlsrpsmBpkx607WFopNwd/brjnttKjad+eLC0lqs /ZjUQXt4VcJf7Y3xDbvLpXPKZBlYA+bzvrJncqhLm/UWpjrBo9wOd0P0M+xZRKVZ0XoqwS VrfBYZ1iGsrd1KdaNpgnuJUDFKwHrpydbpGAYKRe3j+J9T2x58qa7r5wgux3v1ZjvpjNec occPefeJ3xup2IMWmnUmHoL30heZOSj8Sv0hBFQuhIWpXno54qbqg7kmCTxdug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=4d098982ac55cda66c18cae18c6cf6624d9aa746 commit 4d098982ac55cda66c18cae18c6cf6624d9aa746 Author: Dimitry Andric AuthorDate: 2021-12-24 13:00:39 +0000 Commit: Dimitry Andric CommitDate: 2021-12-24 13:00:39 +0000 Fix gcc gperf prototypes to avoid redeclaration errors, again I got tricked by the newer version of gperf installed by ports, which emits size_t in its prototypes, instead unsigned int, which is emitted by the old version of gperf in contrib/gperf. Fixes: b5cbe4e98125 --- contrib/gcc/cp/cfns.gperf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/gcc/cp/cfns.gperf b/contrib/gcc/cp/cfns.gperf index 079926562919..f04c385e0aa3 100644 --- a/contrib/gcc/cp/cfns.gperf +++ b/contrib/gcc/cp/cfns.gperf @@ -2,11 +2,11 @@ #ifdef __GNUC__ __inline #endif -static unsigned int hash (register const char *, register size_t); +static unsigned int hash (register const char *, register unsigned int); #ifdef __GNUC__ __inline #endif -const char * libc_name_p (register const char *, register size_t); +const char * libc_name_p (register const char *, register unsigned int); %} %% # The standard C library functions, for feeding to gperf; the result is used