Re: 2.4.9 does not compile [better PATCH]

tpepper
2001-08-16T22:11:06Z

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=unknown-8bit, Size: 2057 bytes --]

It looks like they are actually using a 3 argument min() function in the ntfs
code. It seems happy with these three arg's and an include added so this patch is pr÷bably preferable:

diff -Naur linux-2.4.9/fs/ntfs/unistr.c.orig linux-2.4.9/fs/ntfs/unistr.c
--- linux-2.4.9/fs/ntfs/unistr.c.orig Thu Aug 16 14:35:03 2001
+++ linux-2.4.9/fs/ntfs/unistr.c Thu Aug 16 15:07:54 2001
@@ -24,6 +24,7 @@
#include <linux/string.h>
#include <asm/byteorder.h>

+#include "ntfstypes.h"
#include "unistr.h"
#include "macros.h"

@@ -96,7 +97,7 @@
__u32 cnt;
wchar_t c1, c2;

- for (cnt = 0; cnt < min(unsigned int, name1_len, name2_len); ++cnt)
+ for (cnt = 0; cnt < min(__u32, name1_len, name2_len); ++cnt)
{
c1 = le16_to_cpu(*name1++);
c2 = le16_to_cpu(*name2++);

Tim

--
*********************************************************
* tpepper@vato dot org * Venimus, Vidimus, *
* http://www.vato.org/~tpepper * Dolavimus *
*********************************************************

On Thu 16 Aug at 23:11:40 +0200 f5ibh@db0bm.ampr.org done said:

> 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'
> make[3]: *** [unistr.o] Erreur 1
> make[3]: Leaving directory `/usr/src/kernel-sources-2.4.9/fs/ntfs'
> make[2]: *** [_modsubdir_ntfs] Erreur 2
> make[2]: Leaving directory `/usr/src/kernel-sources-2.4.9/fs'
> make[1]: *** [_mod_fs] Erreur 2
> make[1]: Leaving directory `/usr/src/kernel-sources-2.4.9'
> make: *** [stamp-build] Erreur 2