# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1366551755 -10800
# Node ID ad3965b93ef1b1e48e3623c1efb5adf3df065983
# Parent  bb14d7907eb2cad09e4f8c1767a34b5080db6b46# Parent  09528946f92b91469a8325c94f6f0dfec55784f5
Merge.

diff -r bb14d7907eb2 -r ad3965b93ef1 dmpack.c
--- a/dmpack.c	Sun Apr 21 16:40:45 2013 +0300
+++ b/dmpack.c	Sun Apr 21 16:42:35 2013 +0300
@@ -6,7 +6,6 @@
  */
 #include "dmpack.h"
 #include "dmfile.h"
-#include <zlib.h>
 
 
 DMPackEntry *dmPackEntryNew()
diff -r bb14d7907eb2 -r ad3965b93ef1 dmpackutil.c
diff -r bb14d7907eb2 -r ad3965b93ef1 dmres.c
--- a/dmres.c	Sun Apr 21 16:40:45 2013 +0300
+++ b/dmres.c	Sun Apr 21 16:42:35 2013 +0300
@@ -7,6 +7,10 @@
 #include "dmres.h"
 #include <time.h>
 
+#ifdef DM_USE_PACKFS
+#include <zlib.h>
+#endif
+
 #ifdef DM_USE_STDIO
 #include <sys/types.h>
 #include <sys/stat.h>
diff -r bb14d7907eb2 -r ad3965b93ef1 dmres.h
--- a/dmres.h	Sun Apr 21 16:40:45 2013 +0300
+++ b/dmres.h	Sun Apr 21 16:42:35 2013 +0300
@@ -10,7 +10,6 @@
 #include "dmlib.h"
 
 #ifdef DM_USE_PACKFS
-#include <zlib.h>
 #include "dmpack.h"
 #endif