Sat Jun 20 09:40:52 2009 UTC ()

buildfix: don't redefine MIN and MAX. They are defined in <sys/param.h>.


(cegger)

diff -r1.8 -r1.9 src/sys/dev/ieee1394/firewirereg.h

--- src/sys/dev/ieee1394/firewirereg.h 2008/03/29 16:22:53	1.8
+++ src/sys/dev/ieee1394/firewirereg.h 2009/06/20 09:40:52	1.9

 @@ -1,14 +1,14 @@
-/*	$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
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -324,19 +324,17 @@ extern int firewire_phydma_enable;
 #define bio_count b_count
 #define bio_data b_data
 #define bio_dev b_dev
 #define bio_error b_error
 #define bio_flags b_flags
 #if defined(__FreeBSD__)
 #define bio_offset b_offset
 #elif defined(__NetBSD__)
 #define bio_offset b_blkno
 #endif
 #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);
 MALLOC_DECLARE(M_FWXFER);