diff options
author | Denys Vlasenko | 2011-01-16 20:00:24 +0100 |
---|---|---|
committer | Denys Vlasenko | 2011-01-16 20:00:24 +0100 |
commit | 12d97b66805f87e535962963e858fc2422ffdbc7 (patch) | |
tree | 10836c6158a05a505d8a7cb83313cc908e837a50 /libbb/procps.c | |
parent | 2a1571bfa003233470140a17be4ae4f0239f5a24 (diff) | |
download | busybox-12d97b66805f87e535962963e858fc2422ffdbc7.zip busybox-12d97b66805f87e535962963e858fc2422ffdbc7.tar.gz |
apply post-1.18.1 patches, bump version to 1.18.21_18_2
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'libbb/procps.c')
-rw-r--r-- | libbb/procps.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libbb/procps.c b/libbb/procps.c index 7924660..33932a3 100644 --- a/libbb/procps.c +++ b/libbb/procps.c @@ -154,6 +154,7 @@ static unsigned long fast_strtoul_10(char **endptr) return n; } +# if ENABLE_FEATURE_FAST_TOP static long fast_strtol_10(char **endptr) { if (**endptr != '-') @@ -162,6 +163,7 @@ static long fast_strtol_10(char **endptr) (*endptr)++; return - (long)fast_strtoul_10(endptr); } +# endif static char *skip_fields(char *str, int count) { @@ -448,7 +450,7 @@ procps_status_t* FAST_FUNC procps_scan(procps_status_t* sp, int flags) //FIXME: is it safe to assume this field exists? sp->last_seen_on_cpu = fast_strtoul_10(&cp); # endif -#endif /* end of !ENABLE_FEATURE_TOP_SMP_PROCESS */ +#endif /* FEATURE_FAST_TOP */ #if ENABLE_FEATURE_PS_ADDITIONAL_COLUMNS sp->niceness = tasknice; |