patch-2.3.19 linux/drivers/pcmcia/cistpl.c

• Lines: 36
• Date: Sat Oct 2 07:41:14 1999
• Orig file: v2.3.18/linux/drivers/pcmcia/cistpl.c
• Orig date: Tue Sep 7 12:14:06 1999

diff -u --recursive --new-file v2.3.18/linux/drivers/pcmcia/cistpl.c linux/drivers/pcmcia/cistpl.c
@@ -2,7 +2,7 @@
 
     PCMCIA Card Information Structure parser
 
-    cistpl.c 1.70 1999/09/07 15:18:58
+    cistpl.c 1.72 1999/09/15 15:32:19
 
     The contents of this file are subject to the Mozilla Public
     License Version 1.1 (the "License"); you may not use this file
@@ -55,8 +55,6 @@
 #include "cs_internal.h"
 #include "rsrc_mgr.h"
 
-#define MIN(a, b)		(((a) < (b)) ? (a) : (b))
-
 static const u_char mantissa[] = {
     10, 12, 13, 15, 20, 25, 30, 35,
     40, 45, 50, 55, 60, 70, 80, 90
@@ -524,6 +522,8 @@
 
 /*====================================================================*/
 
+#define _MIN(a, b)		(((a) < (b)) ? (a) : (b))
+
 int get_tuple_data(client_handle_t handle, tuple_t *tuple)
 {
     socket_info_t *s;
@@ -542,7 +542,7 @@
 	return CS_SUCCESS;
     read_cis_cache(s, SPACE(tuple->Flags),
 		   tuple->CISOffset + tuple->TupleOffset,
-		   MIN(len, tuple->TupleDataMax), tuple->TupleData);
+		   _MIN(len, tuple->TupleDataMax), tuple->TupleData);
     return CS_SUCCESS;
 }