summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Maischein <corion@corion.net>2012-02-19 10:41:21 +0100
committerMax Maischein <corion@corion.net>2012-02-19 14:14:54 +0100
commitdf4326f0a739fc421855a86a1b8f68d74301c026 (patch)
treeed78ebd3da6bbc929f8b8201c0981bcea10171b9
parentfc013e910ecb5926cbd4a39a00ef6428372a82a1 (diff)
downloadperl-corion-5.15.8-zlib.tar.gz
#define-hack-fix for MinGW-gcc / Win32corion-5.15.8-zlib
-rw-r--r--cpan/Compress-Raw-Zlib/zlib-src/zconf.h8
-rw-r--r--cpan/Compress-Raw-Zlib/zlib-src/zutil.h2
2 files changed, 9 insertions, 1 deletions
diff --git a/cpan/Compress-Raw-Zlib/zlib-src/zconf.h b/cpan/Compress-Raw-Zlib/zlib-src/zconf.h
index 51c80ac144..e065e59ea9 100644
--- a/cpan/Compress-Raw-Zlib/zlib-src/zconf.h
+++ b/cpan/Compress-Raw-Zlib/zlib-src/zconf.h
@@ -440,7 +440,13 @@ typedef uLong FAR uLongf;
# define z_off64_t off64_t
#else
# if defined(_WIN32)
-# define z_off64_t __int64
+# if defined(__GNUC__)
+#include "stdint.h"
+#define HAVE_PTRDIFF
+# define z_off64_t int64_t
+# else
+# define z_off64_t __int64
+# endif
# else
# define z_off64_t z_off_t
#endif
diff --git a/cpan/Compress-Raw-Zlib/zlib-src/zutil.h b/cpan/Compress-Raw-Zlib/zlib-src/zutil.h
index dff1112feb..ceee2fbbfc 100644
--- a/cpan/Compress-Raw-Zlib/zlib-src/zutil.h
+++ b/cpan/Compress-Raw-Zlib/zlib-src/zutil.h
@@ -30,8 +30,10 @@
#endif
#ifdef Z_SOLO
+#ifndef HAVE_PTRDIFF
typedef long ptrdiff_t; /* guess -- will be caught if guess is wrong */
#endif
+#endif
#ifndef local
# define local static