From 2d4f18457e65556277fe203aeee2bc6e20f87a44 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 26 Sep 2008 15:11:50 +0200 Subject: [PATCH] Applying Fedoras dosfstools-2.11-assumeKernel26.patch from Peter Vrabec to remove linux 2.6 conditionals: * LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0) does not work with glibc-kernheaders-2.4-9.1.94 Signed-off-by: Daniel Baumann --- dosfsck/common.h | 5 ----- dosfsck/dosfsck.h | 5 ----- dosfsck/file.c | 5 ----- mkdosfs/mkdosfs.c | 5 ----- 4 files changed, 20 deletions(-) diff --git a/dosfsck/common.h b/dosfsck/common.h index 0586e07..de0fb3e 100644 --- a/dosfsck/common.h +++ b/dosfsck/common.h @@ -2,13 +2,8 @@ /* Written 1993 by Werner Almesberger */ -#include -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0) -# define __KERNEL__ # include -# undef __KERNEL__ # define MSDOS_FAT12 4084 /* maximum number of clusters in a 12 bit FAT */ -#endif #ifndef _COMMON_H #define _COMMON_H diff --git a/dosfsck/dosfsck.h b/dosfsck/dosfsck.h index 7c6dc67..bd10834 100644 --- a/dosfsck/dosfsck.h +++ b/dosfsck/dosfsck.h @@ -14,13 +14,8 @@ #define _LINUX_STRING_H_ /* hack to avoid inclusion of */ #define _LINUX_FS_H /* hack to avoid inclusion of */ -#include -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0) -# define __KERNEL__ # include # include -# undef __KERNEL__ -#endif #include diff --git a/dosfsck/file.c b/dosfsck/file.c index f57f4b7..e3d2f73 100644 --- a/dosfsck/file.c +++ b/dosfsck/file.c @@ -16,12 +16,7 @@ #define _LINUX_STRING_H_ /* hack to avoid inclusion of */ #define _LINUX_FS_H /* hack to avoid inclusion of */ -#include -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0) -# define __KERNEL__ # include -# undef __KERNEL__ -#endif #include diff --git a/mkdosfs/mkdosfs.c b/mkdosfs/mkdosfs.c index ef14fe8..1bdd119 100644 --- a/mkdosfs/mkdosfs.c +++ b/mkdosfs/mkdosfs.c @@ -66,12 +66,7 @@ #include #include -#include -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0) -# define __KERNEL__ # include -# undef __KERNEL__ -#endif #if __BYTE_ORDER == __BIG_ENDIAN