--- linux-2.4.9/fs/ntfs/unistr.c.~1~ Wed Aug 15 04:22:17 2001 +++ linux-2.4.9/fs/ntfs/unistr.c Thu Aug 16 23:44:34 2001 @@ -95,8 +95,9 @@ { __u32 cnt; wchar_t c1, c2; + __u32 min_len = ((name1_len < name2_len) ? name1_len : name2_len); - for (cnt = 0; cnt < min(unsigned int, name1_len, name2_len); ++cnt) + for (cnt = 0; cnt < min_len; ++cnt) { c1 = le16_to_cpu(*name1++); c2 = le16_to_cpu(*name2++);