Module Name: src
Committed By: martin
Date: Sun Feb 4 12:10:48 UTC 2018
Modified Files:
src/sys/fs/msdosfs [netbsd-8]: msdosfs_fat.c
src/usr.sbin/makefs/msdos [netbsd-8]: msdosfs_vfsops.c
Log Message:
Pull up following revision(s) (requested by sevan in ticket #518):
sys/fs/msdosfs/msdosfs_fat.c: revision 1.32
usr.sbin/makefs/msdos/msdosfs_vfsops.c: revision 1.11
Need strings.h for ffs()
Need strings.h for ffs()
Resolves implict declaration warning of ffs() when building tools via
build.sh
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.31.10.1 src/sys/fs/msdosfs/msdosfs_fat.c
cvs rdiff -u -r1.10 -r1.10.8.1 src/usr.sbin/makefs/msdos/msdosfs_vfsops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/fs/msdosfs/msdosfs_fat.c
diff -u src/sys/fs/msdosfs/msdosfs_fat.c:1.31 src/sys/fs/msdosfs/msdosfs_fat.c:1.31.10.1
--- src/sys/fs/msdosfs/msdosfs_fat.c:1.31 Sat May 7 16:43:02 2016
+++ src/sys/fs/msdosfs/msdosfs_fat.c Sun Feb 4 12:10:48 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: msdosfs_fat.c,v 1.31 2016/05/07 16:43:02 mlelstv Exp $ */
+/* $NetBSD: msdosfs_fat.c,v 1.31.10.1 2018/02/04 12:10:48 martin Exp $ */
/*-
* Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank.
@@ -52,7 +52,7 @@
#endif
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: msdosfs_fat.c,v 1.31 2016/05/07 16:43:02 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: msdosfs_fat.c,v 1.31.10.1 2018/02/04 12:10:48 martin Exp $");
/*
* kernel include files.
@@ -69,6 +69,7 @@ __KERNEL_RCSID(0, "$NetBSD: msdosfs_fat.
#include <sys/buf.h>
#include <sys/vnode.h> /* to define vattr structure */
#else
+#include <strings.h>
#include <ffs/buf.h>
#endif
Index: src/usr.sbin/makefs/msdos/msdosfs_vfsops.c
diff -u src/usr.sbin/makefs/msdos/msdosfs_vfsops.c:1.10 src/usr.sbin/makefs/msdos/msdosfs_vfsops.c:1.10.8.1
--- src/usr.sbin/makefs/msdos/msdosfs_vfsops.c:1.10 Sat Jan 30 09:59:27 2016
+++ src/usr.sbin/makefs/msdos/msdosfs_vfsops.c Sun Feb 4 12:10:48 2018
@@ -50,7 +50,7 @@
#endif
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: msdosfs_vfsops.c,v 1.10 2016/01/30 09:59:27 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: msdosfs_vfsops.c,v 1.10.8.1 2018/02/04 12:10:48 martin Exp $");
#include <sys/param.h>
@@ -68,6 +68,7 @@ __KERNEL_RCSID(0, "$NetBSD: msdosfs_vfso
#include <stdlib.h>
#include <string.h>
#include <util.h>
+#include <strings.h>
#include "makefs.h"
#include "msdos.h"