patch-2.4.9 linux/fs/ntfs/macros.h

Next file: linux/fs/ntfs/support.c
Previous file: linux/fs/ntfs/inode.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.8/linux/fs/ntfs/macros.h linux/fs/ntfs/macros.h
@@ -11,12 +11,6 @@
 #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")

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)