fix windows build

diff --git a/ext/phar/phar.c b/ext/phar/phar.c
index cf84213265c3d38074aadb9a73bebf45b183c017..e1cbb5f1da7e025a5d1f913d49f89309e1073890 100644 (file)
--- a/ext/phar/phar.c
+++ b/ext/phar/phar.c
@@ -936,7 +936,7 @@ int phar_open_file(php_stream *fp, char *fname, int fname_len, char *alias, int
                        MAPPHAR_FAIL("Cannot open archive \"%s\", invalid alias");
                }
                if (SUCCESS == zend_hash_find(&(PHAR_GLOBALS->phar_alias_map), alias, alias_len, (void **)&fd_ptr)) {
-                       if (SUCCESS != phar_free_alias(*fd_ptr, alias, alias_len)) {
+                       if (SUCCESS != phar_free_alias(*fd_ptr, alias, alias_len TSRMLS_CC)) {
                                signature = NULL;
                                fp = NULL;
                                MAPPHAR_FAIL("Cannot open archive \"%s\", alias is already in use by existing archive");
@@ -1540,7 +1540,7 @@ int phar_detect_phar_fname_ext(const char *filename, int check_length, const cha
                phar_archive_data **pphar;
 
                if (is_complete) {
-                       if (SUCCESS == zend_hash_find(&(PHAR_GLOBALS->phar_fname_map), filename, filename_len, (void **)&pphar)) {
+                       if (SUCCESS == zend_hash_find(&(PHAR_GLOBALS->phar_fname_map), (char *) filename, filename_len, (void **)&pphar)) {
                                *ext_str = filename + (filename_len - (*pphar)->ext_len);
 woohoo:
                                *ext_len = (*pphar)->ext_len;
@@ -1566,7 +1566,7 @@ woohoo:
                                        break;
                                }
 
-                               if (keylen > filename_len) {
+                               if (keylen > (uint) filename_len) {
                                        zend_hash_move_forward(&(PHAR_GLOBALS->phar_fname_map));
                                        continue;
                                }

diff --git a/ext/phar/tar.c b/ext/phar/tar.c
index 0f141bc0ae8a4b438323377282fed6e24d875a31..a97bbf01252ce4f214de4444eaa42a432c6b11a7 100644 (file)
--- a/ext/phar/tar.c
+++ b/ext/phar/tar.c
@@ -401,7 +401,7 @@ int phar_open_tarfile(php_stream* fp, char *fname, int fname_len, char *alias, i
 
                myphar->is_temporary_alias = 0;
                if (SUCCESS == zend_hash_find(&(PHAR_GLOBALS->phar_alias_map), alias, alias_len, (void **)&fd_ptr)) {
-                       if (SUCCESS != phar_free_alias(*fd_ptr, alias, alias_len)) {
+                       if (SUCCESS != phar_free_alias(*fd_ptr, alias, alias_len TSRMLS_CC)) {
                                if (error) {
                                        spprintf(error, 4096, "phar error: Unable to add tar-based phar \"%s\", alias is already in use", fname);
                                }

diff --git a/ext/phar/zip.c b/ext/phar/zip.c
index 43f2a7599738f83107fad6d7e7e640491d1b0d8d..cb004bf9f904fa5c906caf03a0de2452696e0f3b 100644 (file)
--- a/ext/phar/zip.c
+++ b/ext/phar/zip.c
@@ -444,7 +444,7 @@ foundit:
                                PHAR_ZIP_FAIL("invalid alias");
                        }
                        if (SUCCESS == zend_hash_find(&(PHAR_GLOBALS->phar_alias_map), alias, alias_len, (void **)&fd_ptr)) {
-                               if (SUCCESS != phar_free_alias(*fd_ptr, alias, alias_len)) {
+                               if (SUCCESS != phar_free_alias(*fd_ptr, alias, alias_len TSRMLS_CC)) {
                                        PHAR_ZIP_FAIL("alias is already in use by existing archive");
                                }
                        }