Module Name: src
Committed By: christos
Date: Wed Mar 21 15:55:50 UTC 2012
Modified Files:
src/sys/fs/v7fs: v7fs_file.c
Log Message:
don't re-define MIN
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/fs/v7fs/v7fs_file.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/v7fs/v7fs_file.c
diff -u src/sys/fs/v7fs/v7fs_file.c:1.3 src/sys/fs/v7fs/v7fs_file.c:1.4
--- src/sys/fs/v7fs/v7fs_file.c:1.3 Fri Jul 29 23:51:53 2011
+++ src/sys/fs/v7fs/v7fs_file.c Wed Mar 21 11:55:50 2012
@@ -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.4 2012/03/21 15:55:50 christos 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.4 2012/03/21 15:55:50 christos 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"
