Splitting statements with #define's can cause trouble for cross

compilers (and it looks a bit messy)

diff --git a/procps/top.c b/procps/top.c
index 9944598c280a461359e54b6388d38d190ab0ba91..64b3c0732dec9a4a8e947fe36fa8dd45a5f5feda 100644 (file)
--- a/procps/top.c
+++ b/procps/top.c
@@ -409,17 +409,15 @@ static void display_status(int count, int col)
                        sprintf(rss_str_buf, "%6ldM", s->rss/1024);
                else
                        sprintf(rss_str_buf, "%7ld", s->rss);
-               printf(
 #ifdef FEATURE_CPU_USAGE_PERCENTAGE
-                       "%5d %-8s %s  %s %5d %2d.%d %2u.%u ",
+               printf("%5d %-8s %s  %s %5d %2d.%d %2u.%u ",
+                       s->pid, s->user, s->state, rss_str_buf, s->ppid,
+                       s->pcpu/10, s->pcpu%10, pmem/10, pmem%10);
 #else
-                       "%5d %-8s %s  %s %5d %2u.%u ",
-#endif
+               printf("%5d %-8s %s  %s %5d %2u.%u ",
                        s->pid, s->user, s->state, rss_str_buf, s->ppid,
-#ifdef FEATURE_CPU_USAGE_PERCENTAGE
-                       s->pcpu/10, s->pcpu%10,
-#endif
                        pmem/10, pmem%10);
+#endif
                        if(strlen(namecmd) > col)
                                namecmd[col] = 0;
                        printf("%s\n", namecmd);