git: fb2e96562aeb - main - makefs: Fix a couple of HAVE_STRUCT_STAT_BIRTHTIME checks
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 06 May 2025 16:58:33 UTC
The branch main has been updated by jrtc27:
URL: https://cgit.FreeBSD.org/src/commit/?id=fb2e96562aeb126b8c3e877a0ae13f61904ac4ec
commit fb2e96562aeb126b8c3e877a0ae13f61904ac4ec
Author: Jessica Clarke <jrtc27@FreeBSD.org>
AuthorDate: 2025-05-06 16:58:09 +0000
Commit: Jessica Clarke <jrtc27@FreeBSD.org>
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);