Module Name: src
Committed By: cegger
Date: Sat Jun 20 09:40:52 UTC 2009
Modified Files:
src/sys/dev/ieee1394: firewirereg.h
Log Message:
buildfix: don't redefine MIN and MAX. They are defined in <sys/param.h>.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/ieee1394/firewirereg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ieee1394/firewirereg.h
diff -u src/sys/dev/ieee1394/firewirereg.h:1.8 src/sys/dev/ieee1394/firewirereg.h:1.9
--- src/sys/dev/ieee1394/firewirereg.h:1.8 Sat Mar 29 16:22:53 2008
+++ src/sys/dev/ieee1394/firewirereg.h Sat Jun 20 09:40:52 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: firewirereg.h,v 1.8 2008/03/29 16:22:53 kiyohara Exp $ */
+/* $NetBSD: firewirereg.h,v 1.9 2009/06/20 09:40:52 cegger Exp $ */
/*-
* Copyright (c) 2003 Hidetoshi Shimokawa
* Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa
@@ -334,8 +334,6 @@
#define bio_resid b_resid
#define BIO_READ B_READ
#define BIO_WRITE B_WRITE
-#define MIN(a,b) (((a)<(b))?(a):(b))
-#define MAX(a,b) (((a)>(b))?(a):(b))
#endif
MALLOC_DECLARE(M_FW);
