]> granicus.if.org Git - php/commitdiff
fix 5.2 build
authorGreg Beaver <cellog@php.net>
Mon, 11 Feb 2008 04:48:58 +0000 (04:48 +0000)
committerGreg Beaver <cellog@php.net>
Mon, 11 Feb 2008 04:48:58 +0000 (04:48 +0000)
ext/phar/phar.c
ext/phar/phar_object.c
ext/phar/tar.c

index c0d03575d31e3a46f51f7fdaa617dcdd454b27f1..65f476b5f6cc12d15fc5ea64b16e4ef351bdd165 100644 (file)
@@ -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
index e6e2f5172c1c68db23b76bed7c888312da51815e..9e92f1f0cc478840f98d56cd2e08fbabeb21bb82 100755 (executable)
@@ -521,7 +521,7 @@ PHP_METHOD(Phar, webPhar)
                zp[0] = &params;
 
 #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
index d708c0f517babbeab9e28266793af307d5b12eb3..30d962615fb83d4beceaf22ef78db6585fa9f2a5 100644 (file)
@@ -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