Mercurial > hg > dmlib

changeset 722:ad3965b93ef1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge.
author Matti Hamalainen <ccr@tnsp.org>
date Sun, 21 Apr 2013 16:42:35 +0300
parents bb14d7907eb2 (current diff) 09528946f92b (diff)
children da39c2255aa2 3d74dc794a0a
files dmpack.c dmpackutil.c dmres.c dmres.h
diffstat 3 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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()
--- 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>
--- 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