Merge commit '8d0e0cdadf726beab28ccdc7d69738c1534e1f74' into merge

Conflicts:
	include/platform.h
	libbb/Kbuild.src
	libbb/messages.c

1 files changed, 3 insertions, 1 deletions

diff --git a/libbb/procps.c b/libbb/procps.c
index fcf86d9bb..c68d3e655 100644
--- a/libbb/procps.c
+++ b/libbb/procps.c
@@ -155,6 +155,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 != '-')
@@ -163,6 +164,7 @@ static long fast_strtol_10(char **endptr)
         (*endptr)++;
         return - (long)fast_strtoul_10(endptr);
 }
+# endif
 
 static char *skip_fields(char *str, int count)
 {
@@ -451,7 +453,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;