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 /networking | |
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 'networking')
-rw-r--r-- | networking/ether-wake.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/networking/ether-wake.c b/networking/ether-wake.c index bf09cd529..2d389ea30 100644 --- a/networking/ether-wake.c +++ b/networking/ether-wake.c | |||
@@ -121,10 +121,7 @@ static void get_dest_addr(const char *hostid, struct ether_addr *eaddr) | |||
121 | eap = ether_aton_r(hostid, eaddr); | 121 | eap = ether_aton_r(hostid, eaddr); |
122 | if (eap) { | 122 | if (eap) { |
123 | bb_debug_msg("The target station address is %s\n\n", ether_ntoa(eap)); | 123 | bb_debug_msg("The target station address is %s\n\n", ether_ntoa(eap)); |
124 | #if !defined(__UCLIBC_MAJOR__) \ | 124 | #if !defined(__UCLIBC__) || UCLIBC_VERSION >= KERNEL_VERSION(0, 9, 30) |
125 | || __UCLIBC_MAJOR__ > 0 \ | ||
126 | || __UCLIBC_MINOR__ > 9 \ | ||
127 | || (__UCLIBC_MINOR__ == 9 && __UCLIBC_SUBLEVEL__ >= 30) | ||
128 | } else if (ether_hostton(hostid, eaddr) == 0) { | 125 | } else if (ether_hostton(hostid, eaddr) == 0) { |
129 | bb_debug_msg("Station address for hostname %s is %s\n\n", hostid, ether_ntoa(eaddr)); | 126 | bb_debug_msg("Station address for hostname %s is %s\n\n", hostid, ether_ntoa(eaddr)); |
130 | #endif | 127 | #endif |