Module Name: src
Committed By: christos
Date: Sun Jan 27 21:56:27 UTC 2013
Modified Files:
src/sbin/newfs_msdos: mkfs_msdos.c
Log Message:
nbtool_config.h undefines _NETBSD_SOURCE, and that makes <sys/types.h> not
define cpuid_t, which makes <sys/mount.h> unincludable. Although this is a
bug in the build system, it is simpler to fix it here.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sbin/newfs_msdos/mkfs_msdos.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/newfs_msdos/mkfs_msdos.c
diff -u src/sbin/newfs_msdos/mkfs_msdos.c:1.5 src/sbin/newfs_msdos/mkfs_msdos.c:1.6
--- src/sbin/newfs_msdos/mkfs_msdos.c:1.5 Thu Jan 24 14:24:56 2013
+++ src/sbin/newfs_msdos/mkfs_msdos.c Sun Jan 27 16:56:26 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: mkfs_msdos.c,v 1.5 2013/01/24 19:24:56 christos Exp $ */
+/* $NetBSD: mkfs_msdos.c,v 1.6 2013/01/27 21:56:26 christos Exp $ */
/*
* Copyright (c) 1998 Robert Nordier
@@ -37,16 +37,16 @@
static const char rcsid[] =
"$FreeBSD: src/sbin/newfs_msdos/newfs_msdos.c,v 1.15 2000/10/10 01:49:37 wollman Exp $";
#else
-__RCSID("$NetBSD: mkfs_msdos.c,v 1.5 2013/01/24 19:24:56 christos Exp $");
+__RCSID("$NetBSD: mkfs_msdos.c,v 1.6 2013/01/27 21:56:26 christos Exp $");
#endif
#endif /* not lint */
#include <sys/types.h>
#include <sys/param.h>
-#include <sys/mount.h>
#include <sys/stat.h>
#include <sys/time.h>
#ifndef MAKEFS
+#include <sys/mount.h>
#include <sys/disk.h>
#endif
