diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2010-03-06 20:50:29 +0100 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2010-03-06 20:50:29 +0100 |
commit | 8cb40361c0de1cf5db3b4dcfed60645504eecabf (patch) | |
tree | 8d69fadb3d6789bcd42c2ba47d623e9caf6c4634 /libbb | |
parent | f3c742f925c31bdf1b0d52c82e0ef608a344e10f (diff) | |
download | busybox-w32-8cb40361c0de1cf5db3b4dcfed60645504eecabf.tar.gz busybox-w32-8cb40361c0de1cf5db3b4dcfed60645504eecabf.tar.bz2 busybox-w32-8cb40361c0de1cf5db3b4dcfed60645504eecabf.zip |
libbb/loop.c: use common fix_u32.h trick
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'libbb')
-rw-r--r-- | libbb/loop.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/libbb/loop.c b/libbb/loop.c index a11933f35..07d16e011 100644 --- a/libbb/loop.c +++ b/libbb/loop.c | |||
@@ -8,6 +8,7 @@ | |||
8 | * Licensed under the GPL v2 or later, see the file LICENSE in this tarball. | 8 | * Licensed under the GPL v2 or later, see the file LICENSE in this tarball. |
9 | */ | 9 | */ |
10 | #include "libbb.h" | 10 | #include "libbb.h" |
11 | #include "fix_u32.h" /* hack, so we may include kernel's linux/loop.h */ | ||
11 | #include <linux/version.h> | 12 | #include <linux/version.h> |
12 | 13 | ||
13 | #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) | 14 | #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) |
@@ -15,11 +16,6 @@ | |||
15 | /* For 2.6, use the cleaned up header to get the 64 bit API. */ | 16 | /* For 2.6, use the cleaned up header to get the 64 bit API. */ |
16 | /* linux/loop.h relies on __u64. Make sure we have that as a proper type | 17 | /* linux/loop.h relies on __u64. Make sure we have that as a proper type |
17 | * until userspace is widely fixed. */ | 18 | * until userspace is widely fixed. */ |
18 | # if (defined __INTEL_COMPILER && !defined __GNUC__) \ | ||
19 | || (defined __GNUC__ && defined __STRICT_ANSI__) | ||
20 | __extension__ typedef long long __s64; | ||
21 | __extension__ typedef unsigned long long __u64; | ||
22 | # endif | ||
23 | # include <linux/loop.h> | 19 | # include <linux/loop.h> |
24 | typedef struct loop_info64 bb_loop_info; | 20 | typedef struct loop_info64 bb_loop_info; |
25 | # define BB_LOOP_SET_STATUS LOOP_SET_STATUS64 | 21 | # define BB_LOOP_SET_STATUS LOOP_SET_STATUS64 |