Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/usr.sbin/makefs/ffs.c,v
rcsdiff: /ftp/cvs/cvsroot/src/usr.sbin/makefs/ffs.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.25.2.1
retrieving revision 1.25.2.2
diff -u -p -r1.25.2.1 -r1.25.2.2
--- src/usr.sbin/makefs/ffs.c	2004/04/28 06:00:41	1.25.2.1
+++ src/usr.sbin/makefs/ffs.c	2004/06/22 07:28:36	1.25.2.2
@@ -1,4 +1,4 @@
-/*	$NetBSD: ffs.c,v 1.25.2.1 2004/04/28 06:00:41 jmc Exp $	*/
+/*	$NetBSD: ffs.c,v 1.25.2.2 2004/06/22 07:28:36 tron Exp $	*/
 
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.
@@ -65,13 +65,20 @@
  *	@(#)ffs_alloc.c	8.19 (Berkeley) 7/13/95
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: ffs.c,v 1.25.2.1 2004/04/28 06:00:41 jmc Exp $");
+__RCSID("$NetBSD: ffs.c,v 1.25.2.2 2004/06/22 07:28:36 tron Exp $");
 #endif	/* !__lint */
 
 #include <sys/param.h>
+
+#if !HAVE_NBTOOL_CONFIG_H
 #include <sys/mount.h>
+#endif
 
 #include <assert.h>
 #include <errno.h>