X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcommon%2Fcompressor.cpp;h=84b8f7fead4112d3153e46a6171b5204563a0917;hb=46bba99808aad823adc53744e6d93f5af9bf729d;hp=fd4fb3c90e046561c8925beae5cef60b78a47392;hpb=921e54680da16fcf2adb7a90506875aceb6633a4;p=quassel.git

diff --git a/src/common/compressor.cpp b/src/common/compressor.cpp
index fd4fb3c9..84b8f7fe 100644
--- a/src/common/compressor.cpp
+++ b/src/common/compressor.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2015 by the Quassel Project                        *
+ *   Copyright (C) 2005-2018 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -23,13 +23,6 @@
 #include <QTcpSocket>
 #include <QTimer>
 
-#ifdef HAVE_ZLIB
-#    include <zlib.h>
-#else
-#    define MINIZ_HEADER_FILE_ONLY
-#    include "../../3rdparty/miniz/miniz.c"
-#endif
-
 const int maxBufferSize = 64 * 1024 * 1024; // protect us from zip bombs
 const int ioBufferSize = 64 * 1024;         // chunk size for inflate/deflate; should not be too large as we preallocate that space!
 
@@ -97,7 +90,7 @@ bool Compressor::initStreams()
     _deflater = new z_stream;
     memset(_deflater, 0, sizeof(z_stream));
     if (Z_OK != deflateInit(_deflater, zlevel)) {
-        qWarning() << "Could not intialize the deflate stream!";
+        qWarning() << "Could not initialize the deflate stream!";
         return false;
     }