From 3a111e5d744f875cde11fe755d03d3df3519f8a2 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Mon, 11 Aug 2014 21:46:13 +0200 Subject: fs/io/GzipOutputStream,GunzipReader: move zlib_domain to src/lib/zlib/Domain.cxx --- src/fs/io/GunzipReader.cxx | 3 +-- src/fs/io/GunzipReader.hxx | 2 -- src/fs/io/GzipOutputStream.cxx | 3 +-- src/fs/io/GzipOutputStream.hxx | 2 -- 4 files changed, 2 insertions(+), 8 deletions(-) (limited to 'src/fs/io') diff --git a/src/fs/io/GunzipReader.cxx b/src/fs/io/GunzipReader.cxx index 388b26412..ad5e41784 100644 --- a/src/fs/io/GunzipReader.cxx +++ b/src/fs/io/GunzipReader.cxx @@ -19,11 +19,10 @@ #include "config.h" #include "GunzipReader.hxx" +#include "lib/zlib/Domain.hxx" #include "util/Error.hxx" #include "util/Domain.hxx" -const Domain zlib_domain("zlib"); - GunzipReader::GunzipReader(Reader &_next, Error &error) :next(_next), eof(false) { diff --git a/src/fs/io/GunzipReader.hxx b/src/fs/io/GunzipReader.hxx index 689125a6a..34fc653fa 100644 --- a/src/fs/io/GunzipReader.hxx +++ b/src/fs/io/GunzipReader.hxx @@ -29,8 +29,6 @@ class Error; class Domain; -extern const Domain zlib_domain; - /** * A filter that decompresses data using zlib. */ diff --git a/src/fs/io/GzipOutputStream.cxx b/src/fs/io/GzipOutputStream.cxx index d05645d9e..27ae6b2ad 100644 --- a/src/fs/io/GzipOutputStream.cxx +++ b/src/fs/io/GzipOutputStream.cxx @@ -19,11 +19,10 @@ #include "config.h" #include "GzipOutputStream.hxx" +#include "lib/zlib/Domain.hxx" #include "util/Error.hxx" #include "util/Domain.hxx" -const Domain zlib_domain("zlib"); - GzipOutputStream::GzipOutputStream(OutputStream &_next, Error &error) :next(_next) { diff --git a/src/fs/io/GzipOutputStream.hxx b/src/fs/io/GzipOutputStream.hxx index 4f6d8b357..e23835de8 100644 --- a/src/fs/io/GzipOutputStream.hxx +++ b/src/fs/io/GzipOutputStream.hxx @@ -29,8 +29,6 @@ class Error; class Domain; -extern const Domain zlib_domain; - /** * A filter that compresses data written to it using zlib, forwarding * compressed data in the "gzip" format. -- cgit v1.2.3