From: Ilia Alshanetsky <iliaa@php.net>
Date: Tue, 25 Oct 2005 15:53:06 +0000 (+0000)
Subject: MFH: Fixed bug #34968 (bz2 extension fails on to build on some win32 setups).
X-Git-Tag: php-5.1.0RC4~30
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e13d51cea376a7b013eb568fd982d99bc13e9f46;p=php

MFH: Fixed bug #34968 (bz2 extension fails on to build on some win32 setups).
---

diff --git a/NEWS b/NEWS
index 829a8e6830..4179552053 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,8 @@ PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? Oct 2005, PHP 5.1 Release Candidate 4
 - Fixed fgetcsv() and fputcsv() inconsistency. (Dmitry)
+- Fixed bug #34968 (bz2 extension fails on to build on some win32 setups).
+  (Ilia)
 - Fixed bug #34957 (PHP doesn't respect ACLs for access checks). (Wez)
 - Fixed bug #34950 (Unable to get WSDL through proxy). (Dmitry)
 - Fixed bug #34938 (dns_get_record() doesn't resolve long hostnames and 
diff --git a/ext/bz2/bz2.c b/ext/bz2/bz2.c
index 81fed64246..f3939c5ea3 100644
--- a/ext/bz2/bz2.c
+++ b/ext/bz2/bz2.c
@@ -441,7 +441,7 @@ PHP_FUNCTION(bzdecompress)
 	char *source, *dest;
 	int source_len, error;
 	long small = 0;
-#if defined(PHP_WIN32) && _MSC_VER < 1300
+#if defined(PHP_WIN32)
 	unsigned __int64 size = 0;
 #else
 	unsigned long long size = 0;