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

diff --git a/NEWS b/NEWS
index 829a8e68305b728f4af42cdd6a1a94e9f48f652c..4179552053c73cd43e2fd12d461c1224c1c9c0a6 100644 (file)
--- 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 81fed64246c607b17d2192af2811f582879724c5..f3939c5ea3f83d4c01254a172fa19aa7541c9f4c 100644 (file)
--- 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;