Date: Fri, 24 Dec 2021 13:02:08 GMT From: Dimitry Andric <dim@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 4d098982ac55 - stable/12 - Fix gcc gperf prototypes to avoid redeclaration errors, again Message-ID: <202112241302.1BOD28iL079075@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/12 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=4d098982ac55cda66c18cae18c6cf6624d9aa746 commit 4d098982ac55cda66c18cae18c6cf6624d9aa746 Author: Dimitry Andric <dim@FreeBSD.org> AuthorDate: 2021-12-24 13:00:39 +0000 Commit: Dimitry Andric <dim@FreeBSD.org> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202112241302.1BOD28iL079075>