hi,
i fixed it for myself by redoing the changes (don't know what the
first arg of min is supposed to be):
--- fs/ntfs/unistr.c.OLD Thu Aug 16 22:26:06 2001
+++ fs/ntfs/unistr.c Thu Aug 16 23:00:36 2001
@@ -96,7 +96,7 @@
__u32 cnt;
wchar_t c1, c2;
- for (cnt = 0; cnt < min(unsigned int, name1_len, name2_len); ++cnt)
+ for (cnt = 0; cnt < min(name1_len, name2_len); ++cnt)
{
c1 = le16_to_cpu(*name1++);
c2 = le16_to_cpu(*name2++);
--- fs/ntfs/macros.h.OLD Thu Aug 16 23:07:50 2001
+++ fs/ntfs/macros.h Thu Aug 16 23:08:04 2001
@@ -11,6 +11,12 @@
#define NTFS_INO2VOL(ino) (&((ino)->i_sb->u.ntfs_sb))
#define NTFS_LINO2NINO(ino) (&((ino)->u.ntfs_i))
+/* Classical min and max macros still missing in standard headers... */
+#ifndef min
+#define min(a,b) ((a) <= (b) ? (a) : (b))
+#define max(a,b) ((a) >= (b) ? (a) : (b))
+#endif
+
#define IS_MAGIC(a,b) (*(int*)(a) == *(int*)(b))
#define IS_MFT_RECORD(a) IS_MAGIC((a),"FILE")
#define IS_INDEX_RECORD(a) IS_MAGIC((a),"INDX")
~dirkw
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Thu Aug 23 2001 - 21:00:20 EST