From nobody Sun Aug 03 10:03:25 2025 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 4bvwHf01JSz639FR; Sun, 03 Aug 2025 10:03:26 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bvwHd6GG1z3tfD; Sun, 03 Aug 2025 10:03:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754215405; 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=+XukJCvKb8oWmzWXsyyTbDWViZcSsu0HFjdhknVe9Rw=; b=oLX1nONVXA6OJqClpbuPVNvZe4ZYMcBod1jLFJ7ZM4xWHMrC9kgrqtlBK3+UcmrxD3Iv+q S+Ac6CbM3q1+WKhNWIIRU201c7+P30dY1lrdErID7hUNrGQ4lXlBUwq6hZrRutBynWx98l 6A9Q2CNhIe3RQ7+2bYsitRpAwJlPIVNT3B87vpcnPtZnpB+yO79480x9aKTyQdNpQp6PAz qyoNaEZtN5GLt/0i4Ta2K56sQ/Da4mYhMKokujvKYE/Rn/zKNhMN0hphDb7A/yzea9NOrv vBK7DA/WfbAQ3s3mixPeTlfgA8hBeRQrnQOPf/C0/7miwN+fNNBim8+6tLRgOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754215405; 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=+XukJCvKb8oWmzWXsyyTbDWViZcSsu0HFjdhknVe9Rw=; b=gjvUV+zXakwoTCmcv8nMUkwxUujxZNXJeWgdK10tkzSFXSZW2SCQPTKpI3YZW+dQ91aeyg K0oKjDH+stdcbB4a+EgAiy/dx0bHxfGwXox+sm4CpO/TzEOpzBFiCzJYj1i7l92/VDCI+c X8T4VbIMjcnfK62KZnWJYE3Qa9mVYlkiB9g37OcF3PQEj4gpv31E0mD4BQ1BRffgcyNqYn kZ1mbsgwz6HFQshHL0YOJZqiMj/xNQtZgWxLTL3yFDml4lfdKn8luAoj8/2j4G5dH1asmK y8h8YJyBUbEPz3KGuE1YUrCpI6a6J+K8Z9FUhOdZGiSZdb7dVw6bn/2Ak3QpPQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1754215405; a=rsa-sha256; cv=none; b=xbbM50y19kFFo+nb0GuhcKIu6VqoMs+VnC52zbcVqzjfZBZSr++LFy8r/HD9J9qTbnH3W8 vZptYPLOeFayt05VuuWIpOxclotAhpW9NVyypBVmaK/SqFo2znU7nmZWxKNvVtYKmRFrp/ X4RkUFWKrjFONjru1lIv1I1W7Mwi7oEyMWg9mrBZ34GP/SaFWoMMdDmhRwfm2YblKVu0um 7Xy35YTupW/aSRfURjOKVAxwCc+/gmedNuWhBmfQCQEgucqeX1E4kWyKv99tz8fsY3Z9lV D+VDeQOMY4orae7GKu5+vBu83wajNV6fHG0mdteTuLPowg+JZETOw1CzWV0I5Q== 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 4bvwHd5YGRzymK; Sun, 03 Aug 2025 10:03:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 573A3Pdk095219; Sun, 3 Aug 2025 10:03:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 573A3PgQ095216; Sun, 3 Aug 2025 10:03:25 GMT (envelope-from git) Date: Sun, 3 Aug 2025 10:03:25 GMT Message-Id: <202508031003.573A3PgQ095216@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: 630efff12879 - main - fix cross build after expand_number type change 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 630efff12879f64da5338abb08b04710f8c0f2cb Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=630efff12879f64da5338abb08b04710f8c0f2cb commit 630efff12879f64da5338abb08b04710f8c0f2cb Author: Brooks Davis AuthorDate: 2025-08-03 09:48:08 +0000 Commit: Brooks Davis CommitDate: 2025-08-03 10:03:14 +0000 fix cross build after expand_number type change Fixes: 2e0caa7c7e14 ("libutil: Really fix expand_number(3)") --- tools/build/cross-build/include/common/libutil.h | 2 +- tools/build/cross-build/include/linux/libutil.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/build/cross-build/include/common/libutil.h b/tools/build/cross-build/include/common/libutil.h index 15afd2fbca15..3cda32379965 100644 --- a/tools/build/cross-build/include/common/libutil.h +++ b/tools/build/cross-build/include/common/libutil.h @@ -39,4 +39,4 @@ #include_next #endif -int expand_number(const char *_buf, uint64_t *_num); +int expand_number(const char *_buf, int64_t *_num); diff --git a/tools/build/cross-build/include/linux/libutil.h b/tools/build/cross-build/include/linux/libutil.h index 8f9ca406edc1..a1d6508be82d 100644 --- a/tools/build/cross-build/include/linux/libutil.h +++ b/tools/build/cross-build/include/linux/libutil.h @@ -46,7 +46,7 @@ struct pidfh; __BEGIN_DECLS int humanize_number(char *buf, size_t len, int64_t bytes, const char *suffix, int scale, int flags); -int expand_number(const char *_buf, uint64_t *_num); +int expand_number(const char *_buf, int64_t *_num); int flopen(const char *_path, int _flags, ...); int flopenat(int dirfd, const char *path, int flags, ...);