@@ -5,7 +5,7 @@
/* @(#) $Id$ */
-// Modified by Yao Wei Tjong for Urho3D
+// Modified by Yao Wei Tjong & Lasse Oorni for Urho3D
#include "zutil.h"
@@ -14,7 +14,7 @@ extern void exit OF((int));
#endif
// Urho3D: quick fix for debug build
-#ifdef DEBUG
+#if 0
# ifndef verbose
# define verbose 0
@@ -10,6 +10,8 @@
+// Modified by Lasse Oorni for Urho3D
+
#ifndef _Z_UTIL_H
#define _Z_UTIL_H
@@ -182,7 +184,8 @@ typedef unsigned long ulg;
/* Diagnostic functions */
+// Urho3D: disabled to prevent clash with Assimp's zlib
# include <stdio.h>
extern int z_verbose;
extern void z_error OF((char *m));