From e45b444242104e557f1bce14e9c11e3792bbe41f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Mon, 30 Sep 2013 03:26:23 +0200
Subject: Add tweaks to make things build on windows

---
 depends/pack200/src/zip.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'depends/pack200/src')

diff --git a/depends/pack200/src/zip.cpp b/depends/pack200/src/zip.cpp
index baea2ba7..32e8bd50 100644
--- a/depends/pack200/src/zip.cpp
+++ b/depends/pack200/src/zip.cpp
@@ -48,7 +48,7 @@
 
 #include "zip.h"
 
-#include <zlib.h>
+#include "zlib.h"
 
 inline uint32_t jar::get_crc32(uint32_t c, uchar *ptr, uint32_t len)
 {
@@ -324,12 +324,13 @@ inline uint32_t jar::dostime(int y, int n, int d, int h, int m, int s)
 					: (((uint32_t)y - 1980) << 25) | ((uint32_t)n << 21) | ((uint32_t)d << 16) |
 						  ((uint32_t)h << 11) | ((uint32_t)m << 5) | ((uint32_t)s >> 1);
 }
-
+/*
 #ifdef _REENTRANT // solaris
 extern "C" struct tm *gmtime_r(const time_t *, struct tm *);
 #else
 #define gmtime_r(t, s) gmtime(t)
 #endif
+*/
 /*
  * Return the Unix time in DOS format
  */
-- 
cgit v1.2.3