From nobody Fri May 31 03:59:59 2024 X-Original-To: dev-commits-src-all@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 4Vr8XH2WtFz5M4Cg; Fri, 31 May 2024 03:59:59 +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 4Vr8XH207Qz43RG; Fri, 31 May 2024 03:59:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717127999; 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=yyA55YAUaNtZ68TfnC8IU1dWl7A6IVnWZV5ASbpchn8=; b=yKqPnPXTA4BXyzQ++CL8LQqeOIUl9KTJRN432kEtSo6lPgQrDIx+lOBohr2toiECALVX0z 26o2WEfFBrYvbp0PKzIV0ZvQuP9gcNKK/uvHQ2PlWwnL/80/ZGJYVsa30dOYRqlhrBaoJS I2zNQIhqJlpseHwZo+wGcbC++pAOKKzmIg4etreY8OiDg7bf8h5EM+r3BHi5A9ydSJKKx2 9lf4NEXjMARtaGgQUjJgnBc3Zbh7z7Q642alzXBjXVdK+c/5oB90XZVIdraAlsd684zLTE J++Fhlm405o8+EFi3KOKetAAQfu/8zfPg3JimkbO0L8Ct9Xc1ndwAWq9xUQfBA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717127999; a=rsa-sha256; cv=none; b=CUAZHDkBLCI1xpwxrsxgC9EwV57LRWm93ZAcqi9Up5Qft7x23rvSOA+++nO9RlAWxUESUk amWCGxE+PY3DgW2zR066xwQTDh/1dVxlFp3AJyi0VNg3xYKzTNt6W3wYnDcZwUpvI1pwdc 9r1zpMHF2BFW8r9D02th+R0sbUgnz6P0eu2UambReOCEBSdwuVq+PzlNJYkNAF9UU5hoyK vPOmCPvwqF3G182o8SxHRaFGYIm0O+01OsR2OhTofELlM/MLAF2+5o7MpK0MB/XR1usTfL YAh52pIEQvo0RE/ei4tBOeJtw4lLFI+RPVZhcSyT2KWeu8Bw9pDrmEC+6L+yLQ== 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=1717127999; 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=yyA55YAUaNtZ68TfnC8IU1dWl7A6IVnWZV5ASbpchn8=; b=r7MPStrVmUkPxggDhWVzNQeH6V4l0p+WaePFVQPUZG6QiFqOl2ayJVs8D8haZyQXOGPl30 3ae9yW4EwnMwjuL7xHA3O6uzCH+x5YH2BsOL7lCNj1ZmOevCiJjnq2IYqesrPuFk47y15d Wk2c8rPmHZgyzxumdZ72BwSq59/tyzLMM9wc9sIGMyclN3FPKX2UF1llyWcwZni377OPow 5ce6sSdJObcvBRgEIdwN9DxgNl9FodybYCE7duESrhG/Wrzjlb36k89GDGEMsNhp1LuPHA lO7WJEWiL8ibaLkSyILu04OQafw93wfmux8/rsuduW2cRVX8irzeuvm/r0ndbA== 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 4Vr8XH1WzVz17gZ; Fri, 31 May 2024 03:59:59 +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 44V3xxEj081629; Fri, 31 May 2024 03:59:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44V3xxir081626; Fri, 31 May 2024 03:59:59 GMT (envelope-from git) Date: Fri, 31 May 2024 03:59:59 GMT Message-Id: <202405310359.44V3xxir081626@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: d28bbfa2715a - main - localedef: Bootstrap better List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d28bbfa2715a45c841e0eeec38d7f7b73513c66e Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=d28bbfa2715a45c841e0eeec38d7f7b73513c66e commit d28bbfa2715a45c841e0eeec38d7f7b73513c66e Author: Warner Losh AuthorDate: 2024-05-27 17:07:26 +0000 Commit: Warner Losh CommitDate: 2024-05-31 03:59:15 +0000 localedef: Bootstrap better Declare these functions in a macro-safe way instead of relying on ifdefs. Sponsored by: Netflix --- usr.bin/localedef/bootstrap/ctype.h | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/usr.bin/localedef/bootstrap/ctype.h b/usr.bin/localedef/bootstrap/ctype.h index 510873aaa764..6c9532540219 100644 --- a/usr.bin/localedef/bootstrap/ctype.h +++ b/usr.bin/localedef/bootstrap/ctype.h @@ -40,17 +40,14 @@ /* * On macOS isxdigit(), etc are defined in _ctype.h, but we have to include the * target _ctype.h so that localedef uses the correct values. - * To fix macOS bootstrap, provide a declaration of isxdigit(), etc. here. - * However, only do so if they are not already define as a macro (as is the - * case on Linux). + * To fix macOS bootstrap, provide a declaration of isxdigit(), etc. here in + * a macro-safe way. */ -#ifndef isxdigit __BEGIN_DECLS -int isalpha(int); -int isascii(int); -int isdigit(int); -int isgraph(int); -int islower(int); -int isxdigit(int); +int (isalpha)(int); +int (isascii)(int); +int (isdigit)(int); +int (isgraph)(int); +int (islower)(int); +int (isxdigit)(int); __END_DECLS -#endif