patch-2.4.9 linux/fs/ufs/util.h

• Lines: 30
• Date: Wed Aug 15 01:22:17 2001
• Orig file: v2.4.8/linux/fs/ufs/util.h
• Orig date: Mon Dec 11 13:26:44 2000

diff -u --recursive --new-file v2.4.8/linux/fs/ufs/util.h linux/fs/ufs/util.h
@@ -14,10 +14,6 @@
  * some useful macros
  */
 #define in_range(b,first,len)	((b)>=(first)&&(b)<(first)+(len))
-#define min(x,y)		((x)<(y)?(x):(y))
-#define max(x,y)		((x)>(y)?(x):(y))
-
-
 
 /*
  * macros used for retyping
@@ -335,7 +331,7 @@
 	base = offset >> uspi->s_bpfshift;
 	offset &= uspi->s_bpfmask;
 	for (;;) {
-		count = min (size + offset, uspi->s_bpf);
+		count = min(unsigned int, size + offset, uspi->s_bpf);
 		size -= count - offset;
 		pos = ext2_find_next_zero_bit (ubh->bh[base]->b_data, count, offset);
 		if (pos < count || !size)
@@ -382,7 +378,8 @@
 	base = start >> uspi->s_bpfshift;
 	start &= uspi->s_bpfmask;
 	for (;;) {
-		count = min (size + (uspi->s_bpf - start), uspi->s_bpf)
+		count = min(unsigned int,
+			    size + (uspi->s_bpf - start), uspi->s_bpf)
 			- (uspi->s_bpf - start);
 		size -= count;
 		pos = find_last_zero_bit (ubh->bh[base]->b_data,