Module Name: src
Committed By: hgutch
Date: Sun Mar 6 08:31:54 UTC 2022
Modified Files:
src/usr.sbin/makefs/ffs: buf.h newfs_extern.h
Added Files:
src/usr.sbin/makefs/ffs: namespace.h
Log Message:
Make sure daddr_t is a 64 bit type when building tools.
(see also PR sw-bug/56742 ).
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/usr.sbin/makefs/ffs/buf.h
cvs rdiff -u -r0 -r1.1 src/usr.sbin/makefs/ffs/namespace.h
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/makefs/ffs/newfs_extern.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/makefs/ffs/buf.h
diff -u src/usr.sbin/makefs/ffs/buf.h:1.13 src/usr.sbin/makefs/ffs/buf.h:1.14
--- src/usr.sbin/makefs/ffs/buf.h:1.13 Mon Sep 3 16:29:37 2018
+++ src/usr.sbin/makefs/ffs/buf.h Sun Mar 6 08:31:54 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: buf.h,v 1.13 2018/09/03 16:29:37 riastradh Exp $ */
+/* $NetBSD: buf.h,v 1.14 2022/03/06 08:31:54 hgutch Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -49,6 +49,7 @@
#include <stddef.h>
#include <stdlib.h>
#include <err.h>
+#include "namespace.h"
struct componentname {
char *cn_nameptr;
Index: src/usr.sbin/makefs/ffs/newfs_extern.h
diff -u src/usr.sbin/makefs/ffs/newfs_extern.h:1.4 src/usr.sbin/makefs/ffs/newfs_extern.h:1.5
--- src/usr.sbin/makefs/ffs/newfs_extern.h:1.4 Mon Dec 21 00:58:08 2015
+++ src/usr.sbin/makefs/ffs/newfs_extern.h Sun Mar 6 08:31:54 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: newfs_extern.h,v 1.4 2015/12/21 00:58:08 christos Exp $ */
+/* $NetBSD: newfs_extern.h,v 1.5 2022/03/06 08:31:54 hgutch Exp $ */
/* From: NetBSD: extern.h,v 1.3 2000/12/01 12:03:27 simonb Exp $ */
/*
@@ -25,6 +25,8 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include "namespace.h"
+
/* prototypes */
struct fs *ffs_mkfs(const char *, const fsinfo_t *, time_t);
void ffs_write_superblock(struct fs *, const fsinfo_t *);
Added files:
Index: src/usr.sbin/makefs/ffs/namespace.h
diff -u /dev/null src/usr.sbin/makefs/ffs/namespace.h:1.1
--- /dev/null Sun Mar 6 08:31:55 2022
+++ src/usr.sbin/makefs/ffs/namespace.h Sun Mar 6 08:31:54 2022
@@ -0,0 +1,5 @@
+/* $Id: namespace.h,v 1.1 2022/03/06 08:31:54 hgutch Exp $ */
+
+#ifndef daddr_t
+#define daddr_t int64_t
+#endif
