1 files changed, 6 insertions, 20 deletions

diff --git a/editors/cmp.c b/editors/cmp.c
index 0cb80f21e..dbfa4be35 100644
--- a/editors/cmp.c
+++ b/editors/cmp.c
@@ -10,17 +10,6 @@
 /* BB_AUDIT SUSv3 (virtually) compliant -- uses nicer GNU format for -l. */
 /* http://www.opengroup.org/onlinepubs/007904975/utilities/cmp.html */
 
-/* Mar 16, 2003      Manuel Novoa III   (mjn3@codepoet.org)
- *
- * Original version majorly reworked for SUSv3 compliance, bug fixes, and
- * size optimizations.  Changes include:
- * 1) Now correctly distinguishes between errors and actual file differences.
- * 2) Proper handling of '-' args.
- * 3) Actual error checking of i/o.
- * 4) Accept SUSv3 -l option.  Note that we use the slightly nicer gnu format
- *    in the '-l' case.
- */
-
 #include "libbb.h"
 
 static const char fmt_eof[] ALIGN1 = "cmp: EOF on %s\n";
@@ -37,8 +26,7 @@ int cmp_main(int argc UNUSED_PARAM, char **argv)
 {
         FILE *fp1, *fp2, *outfile = stdout;
         const char *filename1, *filename2 = "-";
-        IF_DESKTOP(off_t skip1 = 0, skip2 = 0;)
-        off_t char_pos = 0;
+        off_t skip1 = 0, skip2 = 0, char_pos = 0;
         int line_pos = 1; /* Hopefully won't overflow... */
         const char *fmt;
         int c1, c2;
@@ -59,14 +47,12 @@ int cmp_main(int argc UNUSED_PARAM, char **argv)
 
         if (*++argv) {
                 filename2 = *argv;
-#if ENABLE_DESKTOP
-                if (*++argv) {
+                if (ENABLE_DESKTOP && *++argv) {
                         skip1 = XATOOFF(*argv);
                         if (*++argv) {
                                 skip2 = XATOOFF(*argv);
                         }
                 }
-#endif
         }
 
         fp2 = xfopen_stdin(filename2);
@@ -83,10 +69,10 @@ int cmp_main(int argc UNUSED_PARAM, char **argv)
         else
                 fmt = fmt_differ;
 
-#if ENABLE_DESKTOP
-        while (skip1) { getc(fp1); skip1--; }
-        while (skip2) { getc(fp2); skip2--; }
-#endif
+        if (ENABLE_DESKTOP) {
+                while (skip1) { getc(fp1); skip1--; }
+                while (skip2) { getc(fp2); skip2--; }
+        }
         do {
                 c1 = getc(fp1);
                 c2 = getc(fp2);