From: Greg Beaver Date: Mon, 11 Feb 2008 04:48:58 +0000 (+0000) Subject: fix 5.2 build X-Git-Tag: RELEASE_2_0_0a1~543 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3874e12ee51dae9166b32cd2538257bceb014318;p=php fix 5.2 build --- diff --git a/ext/phar/phar.c b/ext/phar/phar.c index c0d03575d3..65f476b5f6 100644 --- a/ext/phar/phar.c +++ b/ext/phar/phar.c @@ -2418,7 +2418,7 @@ int phar_flush(phar_archive_data *phar, char *user_stub, long len, char **error array_init(&filterparams); /* ext/zlib zval_dtors a separated zval, so we have to make sure it doesn't destroy ours */ #if PHP_VERSION_ID < 50300 - filterparams->refcount = 26; + filterparams.refcount = 26; #else Z_SET_REFCOUNT(filterparams, 26); #endif diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c index e6e2f5172c..9e92f1f0cc 100755 --- a/ext/phar/phar_object.c +++ b/ext/phar/phar_object.c @@ -521,7 +521,7 @@ PHP_METHOD(Phar, webPhar) zp[0] = ¶ms; #if PHP_VERSION_ID < 50300 - if (FAILURE == zend_fcall_info_init(rewrite, &fci, &fcc, NULL TSRMLS_CC)) { + if (FAILURE == zend_fcall_info_init(rewrite, &fci, &fcc TSRMLS_CC)) { #else if (FAILURE == zend_fcall_info_init(rewrite, 0, &fci, &fcc, NULL, NULL TSRMLS_CC)) { #endif @@ -2448,7 +2448,7 @@ PHP_METHOD(Phar, copy) *newentry.metadata = *t; zval_copy_ctor(newentry.metadata); #if PHP_VERSION_ID < 50300 - newentry.metadata.refcount = 1; + newentry.metadata->refcount = 1; #else Z_SET_REFCOUNT_P(newentry.metadata, 1); #endif diff --git a/ext/phar/tar.c b/ext/phar/tar.c index d708c0f517..30d962615f 100644 --- a/ext/phar/tar.c +++ b/ext/phar/tar.c @@ -603,7 +603,7 @@ int phar_tar_flush(phar_archive_data *phar, char *user_stub, long len, char **er array_init(&filterparams); /* ext/zlib zval_dtors a separated zval, so we have to make sure it doesn't destroy ours */ #if PHP_VERSION_ID < 50300 - filterparams->refcount = 26; + filterparams.refcount = 26; #else Z_SET_REFCOUNT(filterparams, 26); #endif