svn commit: trunk/busybox: include procps

vda at busybox.net vda at busybox.net
Thu Apr 17 18:04:38 UTC 2008


Author: vda
Date: 2008-04-17 11:04:38 -0700 (Thu, 17 Apr 2008)
New Revision: 21760

Log:
top: fix build failure



Modified:
   trunk/busybox/include/usage.h
   trunk/busybox/procps/top.c


Changeset:
Modified: trunk/busybox/include/usage.h
===================================================================
--- trunk/busybox/include/usage.h	2008-04-17 18:00:14 UTC (rev 21759)
+++ trunk/busybox/include/usage.h	2008-04-17 18:04:38 UTC (rev 21760)
@@ -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

Modified: trunk/busybox/procps/top.c
===================================================================
--- trunk/busybox/procps/top.c	2008-04-17 18:00:14 UTC (rev 21759)
+++ trunk/busybox/procps/top.c	2008-04-17 18:04:38 UTC (rev 21760)
@@ -861,17 +861,22 @@
 #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;




More information about the busybox-cvs mailing list