aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2004-08-16 08:29:44 +0000
committerEric Andersen <andersen@codepoet.org>2004-08-16 08:29:44 +0000
commitcf6ef0571122d99f45adb782f1181c7abca61ce3 (patch)
treef0d848ff48a117fa76b8f2d7af1e6a901473371e
parentbeaef16315166deec3ee4eba425f4f58542c9491 (diff)
downloadbusybox-w32-cf6ef0571122d99f45adb782f1181c7abca61ce3.tar.gz
busybox-w32-cf6ef0571122d99f45adb782f1181c7abca61ce3.tar.bz2
busybox-w32-cf6ef0571122d99f45adb782f1181c7abca61ce3.zip
Aurelien Jacobs writes:
with a quick conversion you will see that 132608 == 0x20600 so noticed that the elif will never be matched ! Apparently there was already a try to modify this in CVS which was reverted (it was plain wrong). I don't know when __kernel_old_dev_t is needed, but with a 2.6.7 or a 2.6.8 this is __kernel_dev_t wich is needed. I corrected this with the following patch but maybe older 2.6 still need __kernel_old_dev_t ? I think this should be corrected before 1.0. Thanks Aurel
-rw-r--r--libbb/loop.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/libbb/loop.c b/libbb/loop.c
index 1156cefc0..fdd23f803 100644
--- a/libbb/loop.c
+++ b/libbb/loop.c
@@ -32,9 +32,7 @@
32#include <linux/version.h> 32#include <linux/version.h>
33#include <asm/posix_types.h> 33#include <asm/posix_types.h>
34 34
35#if LINUX_VERSION_CODE >= 132608 35#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
36#define __bb_kernel_dev_t __kernel_old_dev_t
37#elif LINUX_VERSION_CODE >= 0x20600
38#define __bb_kernel_dev_t __kernel_dev_t 36#define __bb_kernel_dev_t __kernel_dev_t
39#else 37#else
40#define __bb_kernel_dev_t unsigned short 38#define __bb_kernel_dev_t unsigned short