From fca0057334862ca376f131baf3f09e0abaab369f Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Thu, 30 Jul 2020 04:28:27 +0200
Subject: [PATCH] avoid global zlib.h include

---
 src/engine/command.cc      | 1 +
 src/engine/octa.cc         | 1 +
 src/engine/octaedit.cc     | 2 ++
 src/engine/pvs.cc          | 2 ++
 src/engine/renderlights.cc | 2 ++
 src/engine/rendermodel.cc  | 2 ++
 src/engine/renderva.cc     | 2 ++
 src/engine/shader.cc       | 2 ++
 src/engine/shader.hh       | 2 ++
 src/engine/texture.cc      | 2 ++
 src/sauerlib/tools.hh      | 5 ++---
 src/shared/stream.cc       | 5 +++--
 src/shared/zip.cc          | 2 ++
 13 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/src/engine/command.cc b/src/engine/command.cc
index dbb9076..6b529b1 100644
--- a/src/engine/command.cc
+++ b/src/engine/command.cc
@@ -4,6 +4,7 @@
 #include "command.hh"
 
 #include <cctype>
+#include <climits>
 
 #include <sauerlib/encoding.hh>
 
diff --git a/src/engine/octa.cc b/src/engine/octa.cc
index 151c2c5..735f616 100644
--- a/src/engine/octa.cc
+++ b/src/engine/octa.cc
@@ -3,6 +3,7 @@
 #include "octa.hh"
 
 #include <cassert>
+#include <climits>
 
 #include <shared/command.hh>
 #include <shared/igame.hh>
diff --git a/src/engine/octaedit.cc b/src/engine/octaedit.cc
index ff3812f..a0e88cd 100644
--- a/src/engine/octaedit.cc
+++ b/src/engine/octaedit.cc
@@ -2,6 +2,8 @@
 
 #include <new>
 
+#include <zlib.h>
+
 #include <shared/command.hh>
 #include <shared/glemu.hh>
 #include <shared/igame.hh>
diff --git a/src/engine/pvs.cc b/src/engine/pvs.cc
index f15e34b..34f662e 100644
--- a/src/engine/pvs.cc
+++ b/src/engine/pvs.cc
@@ -1,5 +1,7 @@
 #include "pvs.hh"
 
+#include <climits>
+
 #include <shared/command.hh>
 
 #include "console.hh" /* conoutf */
diff --git a/src/engine/renderlights.cc b/src/engine/renderlights.cc
index 47b3bef..5fdc8b6 100644
--- a/src/engine/renderlights.cc
+++ b/src/engine/renderlights.cc
@@ -1,5 +1,7 @@
 #include "renderlights.hh"
 
+#include <climits>
+
 #include <shared/command.hh>
 #include <shared/glemu.hh>
 #include <shared/igame.hh>
diff --git a/src/engine/rendermodel.cc b/src/engine/rendermodel.cc
index 9d7f228..f0a63b3 100644
--- a/src/engine/rendermodel.cc
+++ b/src/engine/rendermodel.cc
@@ -1,5 +1,7 @@
 #include "rendermodel.hh"
 
+#include <climits>
+
 #include <new>
 
 #include <sauerlib/encoding.hh>
diff --git a/src/engine/renderva.cc b/src/engine/renderva.cc
index 60356f5..6e6889f 100644
--- a/src/engine/renderva.cc
+++ b/src/engine/renderva.cc
@@ -2,6 +2,8 @@
 
 #include "renderva.hh"
 
+#include <climits>
+
 #include <shared/command.hh>
 #include <shared/glemu.hh>
 #include <shared/igame.hh>
diff --git a/src/engine/shader.cc b/src/engine/shader.cc
index 13e9a72..1a33777 100644
--- a/src/engine/shader.cc
+++ b/src/engine/shader.cc
@@ -2,6 +2,8 @@
 
 #include "shader.hh"
 
+#include <climits>
+
 #include <sauerlib/encoding.hh>
 
 #include <shared/command.hh>
diff --git a/src/engine/shader.hh b/src/engine/shader.hh
index e1ef843..7cc6bb4 100644
--- a/src/engine/shader.hh
+++ b/src/engine/shader.hh
@@ -1,6 +1,8 @@
 #ifndef ENGINE_SHADER_HH
 #define ENGINE_SHADER_HH
 
+#include <climits>
+
 #include <shared/glexts.hh>
 #include <shared/tools.hh>
 #include <shared/geom.hh>
diff --git a/src/engine/texture.cc b/src/engine/texture.cc
index 596d2d0..c838cbe 100644
--- a/src/engine/texture.cc
+++ b/src/engine/texture.cc
@@ -4,6 +4,8 @@
 
 #include <ctime>
 
+#include <zlib.h>
+
 #include <sauerlib/encoding.hh>
 
 #include <shared/command.hh>
diff --git a/src/sauerlib/tools.hh b/src/sauerlib/tools.hh
index d511c8e..c507725 100644
--- a/src/sauerlib/tools.hh
+++ b/src/sauerlib/tools.hh
@@ -6,13 +6,12 @@
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
+#include <cstdarg>
 #include <cmath>
 #include <cassert>
 
 #include <new>
 
-#include <zlib.h>
-
 typedef unsigned char uchar;
 typedef unsigned short ushort;
 typedef unsigned int uint;
@@ -1243,7 +1242,7 @@ extern stream *openrawfile(const char *filename, const char *mode);
 extern stream *openzipfile(const char *filename, const char *mode);
 extern stream *openfile(const char *filename, const char *mode);
 extern stream *opentempfile(const char *filename, const char *mode);
-extern stream *opengzfile(const char *filename, const char *mode, stream *file = nullptr, int level = Z_BEST_COMPRESSION);
+extern stream *opengzfile(const char *filename, const char *mode, stream *file = nullptr);
 extern stream *openutf8file(const char *filename, const char *mode, stream *file = nullptr);
 extern char *loadfile(const char *fn, size_t *size, bool utf8 = true);
 extern bool listdir(const char *dir, bool rel, const char *ext, vector<char *> &files);
diff --git a/src/shared/stream.cc b/src/shared/stream.cc
index 62c258d..cbab912 100644
--- a/src/shared/stream.cc
+++ b/src/shared/stream.cc
@@ -1,6 +1,7 @@
 #include <new>
 
 #include <SDL.h>
+#include <zlib.h>
 
 #include <sauerlib/encoding.hh>
 
@@ -1201,12 +1202,12 @@ stream *opentempfile(const char *name, const char *mode)
     return file;
 }
 
-stream *opengzfile(const char *filename, const char *mode, stream *file, int level)
+stream *opengzfile(const char *filename, const char *mode, stream *file)
 {
     stream *source = file ? file : openfile(filename, mode);
     if(!source) return nullptr;
     gzstream *gz = new gzstream;
-    if(!gz->open(source, mode, !file, level)) { if(!file) delete source; delete gz; return nullptr; }
+    if(!gz->open(source, mode, !file, Z_BEST_COMPRESSION)) { if(!file) delete source; delete gz; return nullptr; }
     return gz;
 }
 
diff --git a/src/shared/zip.cc b/src/shared/zip.cc
index 24ebd4c..72c560d 100644
--- a/src/shared/zip.cc
+++ b/src/shared/zip.cc
@@ -1,5 +1,7 @@
 #include <new>
 
+#include <zlib.h>
+
 #include "command.hh"
 
 #include <engine/console.hh> /* conoutf */