From 1b65f0bd2bda7121a90f8cb4c1cacaa20f1b681d Mon Sep 17 00:00:00 2001 From: "Simon J. Gerraty" Date: Fri, 20 Nov 2020 03:54:37 +0000 Subject: Import bmake-20201117 o allow env var MAKE_OBJDIR_CHECK_WRITABLE=no to skip writable checks in InitObjdir. Explicit .OBJDIR target always allows read-only directory. o Fix building and unit-tests on non-BSD. o More code cleanup and refactoring. o More unit tests --- dir.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'dir.h') diff --git a/dir.h b/dir.h index 886b26e18b47..d0badcd1dec7 100644 --- a/dir.h +++ b/dir.h @@ -1,4 +1,4 @@ -/* $NetBSD: dir.h,v 1.32 2020/10/25 10:00:20 rillig Exp $ */ +/* $NetBSD: dir.h,v 1.34 2020/11/14 19:24:24 rillig Exp $ */ /* * Copyright (c) 1988, 1989, 1990 The Regents of the University of California. @@ -101,7 +101,7 @@ Boolean Dir_HasWildcards(const char *); void Dir_Expand(const char *, SearchPath *, StringList *); char *Dir_FindFile(const char *, SearchPath *); char *Dir_FindHereOrAbove(const char *, const char *); -time_t Dir_MTime(GNode *, Boolean); +void Dir_UpdateMTime(GNode *, Boolean); CachedDir *Dir_AddDir(SearchPath *, const char *); char *Dir_MakeFlags(const char *, SearchPath *); void Dir_ClearPath(SearchPath *); @@ -112,12 +112,12 @@ void Dir_Destroy(void *); SearchPath *Dir_CopyDirSearchPath(void); /* Stripped-down variant of struct stat. */ -struct make_stat { - time_t mst_mtime; - mode_t mst_mode; +struct cached_stat { + time_t cst_mtime; + mode_t cst_mode; }; -int cached_lstat(const char *, struct make_stat *); -int cached_stat(const char *, struct make_stat *); +int cached_lstat(const char *, struct cached_stat *); +int cached_stat(const char *, struct cached_stat *); #endif /* MAKE_DIR_H */ -- cgit v1.3