diff options
| author | sos <sos@FreeBSD.org> | 1997-08-29 16:14:20 +0000 |
|---|---|---|
| committer | sos <sos@FreeBSD.org> | 1997-08-29 16:14:20 +0000 |
| commit | c063323c3ee5e28f098fae8c6d46fb551a934d10 (patch) | |
| tree | dc3ae93fcca2bce37ec0a3e46cf4172e155cada7 /gnu | |
| parent | 99b7368a45a052dfe4e61148f2b7f949d35a2008 (diff) | |
| download | FreeBSD-src-c063323c3ee5e28f098fae8c6d46fb551a934d10.zip FreeBSD-src-c063323c3ee5e28f098fae8c6d46fb551a934d10.tar.gz | |
Dont use an internal function called warn it clashes with libc.
Allows ELF compile.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/usr.bin/gzip/match.S | 4 | ||||
| -rw-r--r-- | gnu/usr.bin/gzip/trees.c | 4 | ||||
| -rw-r--r-- | gnu/usr.bin/gzip/util.c | 8 |
3 files changed, 5 insertions, 11 deletions
diff --git a/gnu/usr.bin/gzip/match.S b/gnu/usr.bin/gzip/match.S index 9df5918..c0f933c 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 203c18a..a9b35be 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 eff7be6..58fef08 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); |
