3 files changed, 5 insertions, 11 deletions

diff --git a/gnu/usr.bin/gzip/match.S b/gnu/usr.bin/gzip/match.S
index 9df591821644..c0f933cca09c 100644
--- a/gnu/usr.bin/gzip/match.S
+++ b/gnu/usr.bin/gzip/match.S
@@ -9,12 +9,12 @@
  * Kristoffer Eriksson <ske@pkmab.se>
  */
  
-/* $Id$ */
+/* $Id: match.S,v 1.5 1997/02/22 15:45:59 peter Exp $ */
 
 /* Preprocess with -DNO_UNDERLINE if your C compiler does not prefix
  * external symbols with an underline character '_'.
  */
-#ifdef NO_UNDERLINE
+#ifdef __ELF__ /* NO_UNDERLINE */
 #  define _prev             prev
 #  define _window           window
 #  define _match_start	    match_start
diff --git a/gnu/usr.bin/gzip/trees.c b/gnu/usr.bin/gzip/trees.c
index 203c18a57791..a9b35beedfb1 100644
--- a/gnu/usr.bin/gzip/trees.c
+++ b/gnu/usr.bin/gzip/trees.c
@@ -59,7 +59,7 @@
 #include "gzip.h"
 
 #ifdef RCSID
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$Id: trees.c,v 1.6 1997/02/22 15:46:01 peter Exp $";
 #endif
 
 /* ===========================================================================
@@ -1070,6 +1070,6 @@ local void set_file_type()
     while (n < LITERALS) bin_freq += dyn_ltree[n++].Freq;
     *file_type = bin_freq > (ascii_freq >> 2) ? BINARY : ASCII;
     if (*file_type == BINARY && translate_eol) {
-        warn("-l used on binary file", "");
+        WARN((stderr, "-l used on binary file", ""));
     }
 }
diff --git a/gnu/usr.bin/gzip/util.c b/gnu/usr.bin/gzip/util.c
index eff7be6af243..58fef0819aab 100644
--- a/gnu/usr.bin/gzip/util.c
+++ b/gnu/usr.bin/gzip/util.c
@@ -5,7 +5,7 @@
  */
 
 #ifdef RCSID
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$Id: util.c,v 1.6 1997/02/22 15:46:10 peter Exp $";
 #endif
 
 #include <ctype.h>
@@ -340,12 +340,6 @@ void error(m)
     abort_gzip();
 }
 
-void warn(a, b)
-    char *a, *b;            /* message strings juxtaposed in output */
-{
-    WARN((stderr, "%s: %s: warning: %s%s\n", progname, ifname, a, b));
-}
-
 void read_error()
 {
     fprintf(stderr, "\n%s: ", progname);