Compilation error in ntfs driver

[Joachim Herb <herb@leo.org>]

Hello, 

I think I have found a compilation error in the ntfs driver in file
unistr.c:
make -C ntfs modules
make[2]: Entering directory `/usr/src/linux-2.4.7/fs/ntfs'
gcc -D__KERNEL__ -I/usr/src/linux-2.4.7/include -Wall
-Wstrict-prototypes -Wno-trigraphs -O2 -fomit-frame-pointer
-fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2
-march=athlon  -DMODULE -DNTFS_VERSION=\"1.1.16\"   -c -o
unistr.o unistr.c
unistr.c: In function `ntfs_collate_names':
unistr.c:99: warning: implicit declaration of function `min'
unistr.c:99: parse error before `unsigned'
unistr.c:99: parse error before `)'
unistr.c:97: warning: `c1' might be used uninitialized in this function
unistr.c: At top level:
unistr.c:118: parse error before `if'
unistr.c:123: warning: type defaults to `int' in declaration of `c1'
unistr.c:123: `name1' undeclared here (not in a function)
unistr.c:123: warning: data definition has no type or storage class
unistr.c:124: parse error before `if'

The problem is the following part of the 2.4.9 patch:
diff -u --recursive --new-file v2.4.8/linux/fs/ntfs/unistr.c
linux/fs/ntfs/unistr.c
--- v2.4.8/linux/fs/ntfs/unistr.c       Wed Jul 25 17:10:24 2001
+++ linux/fs/ntfs/unistr.c      Wed Aug 15 01:22:17 2001
@@ -96,7 +96,7 @@
        __u32 cnt;
        wchar_t c1, c2;
 
-       for (cnt = 0; cnt < min(name1_len, name2_len); ++cnt)
+       for (cnt = 0; cnt < min(unsigned int, name1_len, name2_len);
++cnt)
        {
                c1 = le16_to_cpu(*name1++);
                c2 = le16_to_cpu(*name2++);

Simply remove it again, i.e. remove the "unsigned int, ", and the file
compiles (with one warning).

Joachim
-- 
Joachim Herb
mailto:herb@leo.org