Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/fs/v7fs don't re-define MIN
details: https://anonhg.NetBSD.org/src/rev/69aaa293f821
branches: trunk
changeset: 778307:69aaa293f821
user: christos <christos%NetBSD.org@localhost>
date: Wed Mar 21 15:55:50 2012 +0000
description:
don't re-define MIN
diffstat:
sys/fs/v7fs/v7fs_file.c | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diffs (31 lines):
diff -r 8ffcddabece7 -r 69aaa293f821 sys/fs/v7fs/v7fs_file.c
--- a/sys/fs/v7fs/v7fs_file.c Wed Mar 21 15:38:32 2012 +0000
+++ b/sys/fs/v7fs/v7fs_file.c Wed Mar 21 15:55:50 2012 +0000
@@ -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"
Home |
Main Index |
Thread Index |
Old Index