From nobody Tue May 6 16:58:33 2025 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 4ZsPjj6mcfz5v5sr; Tue, 06 May 2025 16:58:33 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZsPjj5TF1z3WX3; Tue, 06 May 2025 16:58:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746550713; 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=oPaI2AjBcj4W7i9teGNKbxaU09cNfqG24VZDtGuksRY=; b=f0ZPw3rX3i7cy3kijvBOusUybYYlS1FWxsmrc7zJa9/pRCIMa26L1PaHDFpWOWt2M/z8Db f5gjZXdyPGo2zLsY9mfOJmP/IYpublbU+41OGqUjpe8hrXKm3B7HZKXxxWJit/fBC1LlxL cbdHRtzlZgpoOEl9tbxMJD2VQjiHH/4/jPddwWc4Q92jOeGe0i8h4x0FjY+s/hd+98+FDP 2IT2aJolYk6vJ4aE3KpDX7o3wHqVNGQ191e+CLkKvWe/2OMUTUj3+f/CyU9w7TDdVpMaHA EBosA1OGPAweMS5cTnVr+uAscBPvKUdKWzPvMtYLwzV8mzsB9v+1YBSrFa7XJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746550713; 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=oPaI2AjBcj4W7i9teGNKbxaU09cNfqG24VZDtGuksRY=; b=aeRFlKyNx9UnBJS/KDHgjIGXdvxQj/E57k9hJrpLvDt0IVqJsBfJibpT1pVdHN40iz37Vp ZXaaFHjzePRWzyt8g+uNC/SHIQevkBj3yri9Z0SQJowdQAYd4qz7LslCAP2E/JEvTnME40 d+zzWFl8D0UZgzX1+KGdziKm/Ppxq/EEN6A01Nxll0XKokdfDnt3c2wBuHCy8EOUYPot0f XOl6s1IXSXeMC1eslYE7HAeztFEwprBjOMb07/vSZEisZ5kPE7n/WmAm+75GAJejiSQBx7 Tm7XFyNFHclS340gWtsBcex3/xN38bxUY5beYLR7u8U35fGBBGE3hqctztMRMQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746550713; a=rsa-sha256; cv=none; b=b+7iDBcXd9BtcovBABUZRZWBPiM5xrwvrN/KQvB8U+m0u00dB2pLrIXrJLKtix/N4BMSc1 PMCySm8c+CsMyHEEJ3N3U7JVCGBkrzU3E6D3qlNwXUTbwFxB7tLs65GmOd4KDK3p7eR5yF vsBvHrSTcXF8aN2xYgkJC72v8pTKpB93w1Cyi2dHN2WENtLEhiqi+7BBCKXA+fOK9ZLnQK lzigItaBiDrnj1pW5t7YdrAKXx0y8zYfBlgIGHxFtjO2Y642regAkAeZWszTBkWFll7ajf USCE6bMWeLHwYU6tJBsFSSS0qljrgndWupCJg8B9z/ZMozlvNpCc/VGdKagT6A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4ZsPjj52Bsz17Ry; Tue, 06 May 2025 16:58:33 +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 546GwXsS051620; Tue, 6 May 2025 16:58:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 546GwXd4051617; Tue, 6 May 2025 16:58:33 GMT (envelope-from git) Date: Tue, 6 May 2025 16:58:33 GMT Message-Id: <202505061658.546GwXd4051617@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: fb2e96562aeb - main - makefs: Fix a couple of HAVE_STRUCT_STAT_BIRTHTIME checks 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: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fb2e96562aeb126b8c3e877a0ae13f61904ac4ec Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=fb2e96562aeb126b8c3e877a0ae13f61904ac4ec commit fb2e96562aeb126b8c3e877a0ae13f61904ac4ec Author: Jessica Clarke AuthorDate: 2025-05-06 16:58:09 +0000 Commit: Jessica Clarke CommitDate: 2025-05-06 16:58:09 +0000 makefs: Fix a couple of HAVE_STRUCT_STAT_BIRTHTIME checks These macros are meant to be 0/1 not undefined/1. Currently we don't actually have nbtool_config.h included for these files so these are always false, but that will change in a future commit and break building on Linux where they are defined to 0. Reviewed by: emaste, markj Differential Revision: https://reviews.freebsd.org/D50077 --- usr.sbin/makefs/makefs.c | 2 +- usr.sbin/makefs/msdos/msdosfs_vnops.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/makefs/makefs.c b/usr.sbin/makefs/makefs.c index dbd8f3a4d39e..7646c1c0f6be 100644 --- a/usr.sbin/makefs/makefs.c +++ b/usr.sbin/makefs/makefs.c @@ -470,7 +470,7 @@ get_tstamp(const char *b, struct stat *st) } st->st_ino = 1; -#ifdef HAVE_STRUCT_STAT_BIRTHTIME +#if HAVE_STRUCT_STAT_BIRTHTIME st->st_birthtime = #endif st->st_mtime = st->st_ctime = st->st_atime = when; diff --git a/usr.sbin/makefs/msdos/msdosfs_vnops.c b/usr.sbin/makefs/msdos/msdosfs_vnops.c index ae1fa3f7bf75..e07f837187fb 100644 --- a/usr.sbin/makefs/msdos/msdosfs_vnops.c +++ b/usr.sbin/makefs/msdos/msdosfs_vnops.c @@ -97,7 +97,7 @@ msdosfs_times(struct denode *dep, const struct stat *st) if (stampst.st_ino) st = &stampst; -#ifdef HAVE_STRUCT_STAT_BIRTHTIME +#if HAVE_STRUCT_STAT_BIRTHTIME unix2fattime(&st->st_birthtim, &dep->de_CDate, &dep->de_CTime); #else unix2fattime(&st->st_ctim, &dep->de_CDate, &dep->de_CTime);