Fix linux-2.6 redeclaration errors, should not break 2.4 builds (#1018)
[openwrt/svn-archive/archive.git] / utils / dosfstools / patches / 002-linux_26_headers.patch
1 diff -urN dosfstools-2.11/dosfsck/common.h dosfstools-2.11.new/dosfsck/common.h
2 --- dosfstools-2.11/dosfsck/common.h 2004-02-25 10:07:01.000000000 +0100
3 +++ dosfstools-2.11.new/dosfsck/common.h 2006-12-09 16:45:12.000000000 +0100
4 @@ -4,9 +4,7 @@
5
6 #include <linux/version.h>
7 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
8 -# define __KERNEL__
9 -# include <asm/types.h>
10 -# undef __KERNEL__
11 +#include <linux/types.h>
12 # define MSDOS_FAT12 4084 /* maximum number of clusters in a 12 bit FAT */
13 #endif
14
15 diff -urN dosfstools-2.11/dosfsck/file.c dosfstools-2.11.new/dosfsck/file.c
16 --- dosfstools-2.11/dosfsck/file.c 2004-02-25 10:07:38.000000000 +0100
17 +++ dosfstools-2.11.new/dosfsck/file.c 2006-12-09 16:45:22.000000000 +0100
18 @@ -18,9 +18,7 @@
19
20 #include <linux/version.h>
21 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
22 -# define __KERNEL__
23 -# include <asm/types.h>
24 -# undef __KERNEL__
25 +#include <linux/types.h>
26 #endif
27
28 #include <linux/msdos_fs.h>
29 diff -urN dosfstools-2.11/dosfsck/io.c dosfstools-2.11.new/dosfsck/io.c
30 --- dosfstools-2.11/dosfsck/io.c 2005-03-12 16:33:58.000000000 +0100
31 +++ dosfstools-2.11.new/dosfsck/io.c 2006-12-09 16:48:43.000000000 +0100
32 @@ -19,6 +19,10 @@
33 #include <sys/ioctl.h>
34 #include <errno.h>
35 #include <fcntl.h>
36 +#include <linux/version.h>
37 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
38 +#include <linux/types.h>
39 +#endif
40 #include <linux/fd.h>
41
42 #include "dosfsck.h"
43 diff -urN dosfstools-2.11/mkdosfs/mkdosfs.c dosfstools-2.11.new/mkdosfs/mkdosfs.c
44 --- dosfstools-2.11/mkdosfs/mkdosfs.c 2005-03-12 17:12:16.000000000 +0100
45 +++ dosfstools-2.11.new/mkdosfs/mkdosfs.c 2006-12-09 16:44:57.000000000 +0100
46 @@ -68,9 +68,7 @@
47
48 #include <linux/version.h>
49 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
50 -# define __KERNEL__
51 -# include <asm/types.h>
52 -# undef __KERNEL__
53 +#include <linux/types.h>
54 #endif
55
56 #if __BYTE_ORDER == __BIG_ENDIAN