From e96dcb4dcffc8ade4c4f812ab2ed63287faaec83 Mon Sep 17 00:00:00 2001 From: Denis Vlasenko Date: Thu, 17 Apr 2008 18:04:38 +0000 Subject: top: fix build failure --- include/usage.h | 5 ----- procps/top.c | 7 ++++++- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/usage.h b/include/usage.h index 09695ef76..01acda16d 100644 --- a/include/usage.h +++ b/include/usage.h @@ -97,11 +97,6 @@ "\n -s sender Sender IP address" \ "\n target Target IP address" \ -//#define ash_trivial_usage \ -// "[FILE]...\n" \ -// "or: ash -c command [args]..." -//#define ash_full_usage "\n\n" \ -// "The ash shell" #define sh_trivial_usage NOUSAGE_STR #define sh_full_usage "" #define ash_trivial_usage NOUSAGE_STR diff --git a/procps/top.c b/procps/top.c index e3f91c8f9..206f9e8be 100644 --- a/procps/top.c +++ b/procps/top.c @@ -861,17 +861,22 @@ int top_main(int argc ATTRIBUTE_UNUSED, char **argv) #else qsort(top, ntop, sizeof(top_status_t), (void*)(sort_function[0])); #endif /* FEATURE_TOP_CPU_USAGE_PERCENTAGE */ - } else { /* TOPMEM */ + } +#if ENABLE_FEATURE_TOPMEM + else { /* TOPMEM */ qsort(topmem, ntop, sizeof(topmem_status_t), (void*)topmem_sort); } +#endif count = lines; if (OPT_BATCH_MODE || count > ntop) { count = ntop; } if (scan_mask == TOP_MASK) display_process_list(count, col); +#if ENABLE_FEATURE_TOPMEM else display_topmem_process_list(count, col); +#endif clearmems(); if (iterations >= 0 && !--iterations) break; -- cgit v1.2.3