Module Name: src
Committed By: snj
Date: Mon Feb 19 19:39:52 UTC 2018
Modified Files:
src/sys/fs/msdosfs [netbsd-7]: msdosfs_fat.c
src/usr.sbin/makefs/msdos [netbsd-7]: msdosfs_vfsops.c
Log Message:
Pull up following revision(s) (requested by sevan in ticket #1558):
sys/fs/msdosfs/msdosfs_fat.c: 1.32
usr.sbin/makefs/msdos/msdosfs_vfsops.c: 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.28 -r1.28.12.1 src/sys/fs/msdosfs/msdosfs_fat.c
cvs rdiff -u -r1.8 -r1.8.2.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.28 src/sys/fs/msdosfs/msdosfs_fat.c:1.28.12.1
--- src/sys/fs/msdosfs/msdosfs_fat.c:1.28 Mon Jan 28 00:17:18 2013
+++ src/sys/fs/msdosfs/msdosfs_fat.c Mon Feb 19 19:39:52 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: msdosfs_fat.c,v 1.28 2013/01/28 00:17:18 christos Exp $ */
+/* $NetBSD: msdosfs_fat.c,v 1.28.12.1 2018/02/19 19:39:52 snj 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.28 2013/01/28 00:17:18 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: msdosfs_fat.c,v 1.28.12.1 2018/02/19 19:39:52 snj 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.8 src/usr.sbin/makefs/msdos/msdosfs_vfsops.c:1.8.2.1
--- src/usr.sbin/makefs/msdos/msdosfs_vfsops.c:1.8 Wed Jul 9 06:04:16 2014
+++ src/usr.sbin/makefs/msdos/msdosfs_vfsops.c Mon Feb 19 19:39:52 2018
@@ -50,7 +50,7 @@
#endif
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: msdosfs_vfsops.c,v 1.8 2014/07/09 06:04:16 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: msdosfs_vfsops.c,v 1.8.2.1 2018/02/19 19:39:52 snj 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"
