Various cosmetic updates and refactors. NFCI.

src/compress_zlib.cpp

@@ -29,6 +29,7 @@
 #include "conf.h"
 #include "compress.h"
 #include "mem.h"
+#include <zlib.h>
 
 
 void zlib_compress_config_t::reset()
@@ -41,14 +42,6 @@ void zlib_compress_config_t::reset()
 }
 
 
-#if !(WITH_ZLIB)
-extern int compress_zlib_dummy;
-int compress_zlib_dummy = 0;
-#else
-
-#include <zlib.h>
-
-
 static int convert_errno_from_zlib(int zr)
 {
     switch (zr)
@@ -251,6 +244,4 @@ unsigned upx_zlib_crc32(const void *buf, unsigned len, unsigned crc)
 #endif
 
 
-#endif /* WITH_ZLIB */
-
 /* vim:set ts=4 sw=4 et: */