diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2013-03-12 11:13:22 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2013-03-12 11:13:22 -0400 |
| commit | 445e7543e80d629173d96a77fbfe228fe795cb88 (patch) | |
| tree | 8cff682c57f9767dd77bcca26f48a750be99bb2a /coreutils | |
| parent | bca5c556c43ced7b368fdd90a24e4aecf40045ac (diff) | |
| download | busybox-w32-445e7543e80d629173d96a77fbfe228fe795cb88.tar.gz busybox-w32-445e7543e80d629173d96a77fbfe228fe795cb88.tar.bz2 busybox-w32-445e7543e80d629173d96a77fbfe228fe795cb88.zip | |
platform: use KERNEL_VERSION to simplify uClibc version checking
This makes reading the logic (as well as adding new code) a lot simpler,
and fixes one or two cases that were broken due to incorrect sub-version
tests.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'coreutils')
| -rw-r--r-- | coreutils/id.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/coreutils/id.c b/coreutils/id.c index 1f20b755e..1f3e1c4c2 100644 --- a/coreutils/id.c +++ b/coreutils/id.c | |||
| @@ -64,12 +64,10 @@ | |||
| 64 | /* This is a NOEXEC applet. Be very careful! */ | 64 | /* This is a NOEXEC applet. Be very careful! */ |
| 65 | 65 | ||
| 66 | #if !ENABLE_USE_BB_PWD_GRP | 66 | #if !ENABLE_USE_BB_PWD_GRP |
| 67 | #if defined(__UCLIBC_MAJOR__) && (__UCLIBC_MAJOR__ == 0) | 67 | #if defined(__UCLIBC__) && UCLIBC_VERSION < KERNEL_VERSION(0, 9, 30) |
| 68 | #if (__UCLIBC_MINOR__ < 9) || (__UCLIBC_MINOR__ == 9 && __UCLIBC_SUBLEVEL__ < 30) | ||
| 69 | #error "Sorry, you need at least uClibc version 0.9.30 for id applet to build" | 68 | #error "Sorry, you need at least uClibc version 0.9.30 for id applet to build" |
| 70 | #endif | 69 | #endif |
| 71 | #endif | 70 | #endif |
| 72 | #endif | ||
| 73 | 71 | ||
| 74 | enum { | 72 | enum { |
| 75 | PRINT_REAL = (1 << 0), | 73 | PRINT_REAL = (1 << 0), |