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/sys/fs/v7fs/v7fs_file.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/fs/v7fs/v7fs_file.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -p -r1.3 -r1.3.2.1
--- src/sys/fs/v7fs/v7fs_file.c	2011/07/30 03:51:53	1.3
+++ src/sys/fs/v7fs/v7fs_file.c	2012/04/17 00:08:21	1.3.2.1
@@ -1,4 +1,4 @@
-/*	$NetBSD: v7fs_file.c,v 1.3 2011/07/30 03:51:53 uch Exp $	*/
+/*	$NetBSD: v7fs_file.c,v 1.3.2.1 2012/04/17 00:08:21 yamt Exp $	*/
 
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -34,19 +34,18 @@
 #endif
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: v7fs_file.c,v 1.3 2011/07/30 03:51:53 uch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: v7fs_file.c,v 1.3.2.1 2012/04/17 00:08:21 yamt Exp $");
 #if defined _KERNEL_OPT
 #include "opt_v7fs.h"
 #endif
 
+#include <sys/param.h>
 #ifdef _KERNEL
 #include <sys/systm.h>
-#include <sys/param.h>
 #else
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
-#define	MIN(a,b)	((/*CONSTCOND*/(a)<(b))?(a):(b))
 #endif
 
 #include "v7fs.h"