diff options
| author | Felipe Pena <felipensp@gmail.com> | 2012-08-21 20:15:48 -0300 |
|---|---|---|
| committer | Felipe Pena <felipensp@gmail.com> | 2012-08-21 20:15:48 -0300 |
| commit | b0dbf714666516ac191bcc5f31498352ffbcb13c (patch) | |
| tree | caffa4d81d0264ee255d7b36357c60fea6c7e598 /ext/phar/tar.c | |
| parent | cd34067aecdd98e513f20d804f8fb1d278c9729a (diff) | |
| parent | 85fa4d7747b79852474928bcd201c40de86b0bec (diff) | |
| download | php-git-b0dbf714666516ac191bcc5f31498352ffbcb13c.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
- Removed PHP 6 checks
Diffstat (limited to 'ext/phar/tar.c')
| -rw-r--r-- | ext/phar/tar.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/ext/phar/tar.c b/ext/phar/tar.c index 917734c992..43d1ede238 100644 --- a/ext/phar/tar.c +++ b/ext/phar/tar.c @@ -986,11 +986,8 @@ int phar_tar_flush(phar_archive_data *phar, char *user_stub, long len, int defau len = -len; } user_stub = 0; -#if PHP_MAJOR_VERSION >= 6 - if (!(len = php_stream_copy_to_mem(stubfile, (void **) &user_stub, len, 0)) || !user_stub) { -#else + if (!(len = php_stream_copy_to_mem(stubfile, &user_stub, len, 0)) || !user_stub) { -#endif if (error) { spprintf(error, 0, "unable to read resource to copy stub to new tar-based phar \"%s\"", phar->fname); } |