patch-2.4.9 linux/drivers/net/wan/comx.c

• Lines: 29
• Date: Wed Aug 15 01:22:15 2001
• Orig file: v2.4.8/linux/drivers/net/wan/comx.c
• Orig date: Tue May 22 10:23:16 2001

diff -u --recursive --new-file v2.4.8/linux/drivers/net/wan/comx.c linux/drivers/net/wan/comx.c
@@ -151,8 +151,8 @@
 		int free = (ch->debug_start - ch->debug_end + ch->debug_size) 
 			% ch->debug_size;
 
-		to_copy = min( free ? free : ch->debug_size, 
-			min (ch->debug_size - ch->debug_end, len) );
+		to_copy = min(int, free ? free : ch->debug_size, 
+			      min(int, ch->debug_size - ch->debug_end, len));
 		memcpy(ch->debug_area + ch->debug_end, str, to_copy);
 		str += to_copy;
 		len -= to_copy;
@@ -567,7 +567,7 @@
 	if (count >= len - off) {
 		*eof = 1;
 	}
-	return( min(count, len - off) );
+	return min(int, count, len - off);
 }
 
 
@@ -597,7 +597,7 @@
 	if (count >= len - off) {
 		*eof = 1;
 	}
-	return( min(count, len - off) );
+	return min(int, count, len - off);
 }