summaryrefslogtreecommitdiffstats
path: root/contrib/file/src/compress.c
diff options
context:
space:
mode:
authordelphij <delphij@FreeBSD.org>2016-06-27 01:29:17 +0000
committerdelphij <delphij@FreeBSD.org>2016-06-27 01:29:17 +0000
commitf1bd70502f890a8668985030c0aecc3aeacb10ac (patch)
treeb8ace7bbb90fbad4c9272ff2656e8bd1ba0cf93f /contrib/file/src/compress.c
parent13c308de0c7cfd639629c469f9bc8442dc993d2b (diff)
parentacd3b1450f7e248d50e7881112092a574b9319b2 (diff)
downloadFreeBSD-src-f1bd70502f890a8668985030c0aecc3aeacb10ac.zip
FreeBSD-src-f1bd70502f890a8668985030c0aecc3aeacb10ac.tar.gz
MFV r302218: file 5.28.
Relnotes: yes MFC after: 2 weeks Approved by: re (gjb)
Diffstat (limited to 'contrib/file/src/compress.c')
-rw-r--r--contrib/file/src/compress.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/contrib/file/src/compress.c b/contrib/file/src/compress.c
index 979443b..1988fe7 100644
--- a/contrib/file/src/compress.c
+++ b/contrib/file/src/compress.c
@@ -35,7 +35,7 @@
#include "file.h"
#ifndef lint
-FILE_RCSID("@(#)$File: compress.c,v 1.96 2016/04/20 00:00:26 christos Exp $")
+FILE_RCSID("@(#)$File: compress.c,v 1.97 2016/05/13 23:02:28 christos Exp $")
#endif
#include "magic.h"
@@ -62,10 +62,9 @@ typedef void (*sig_t)(int);
#if defined(HAVE_SYS_TIME_H)
#include <sys/time.h>
#endif
-#if defined(HAVE_ZLIB_H) && defined(HAVE_LIBZ)
+#if defined(HAVE_ZLIB_H)
#define BUILTIN_DECOMPRESS
#include <zlib.h>
-#define ZLIBSUPPORT
#endif
#ifdef DEBUG
int tty = -1;
OpenPOWER on IntegriCloud