- really fix the windows builds, don't cast many times when only the hash function...

- copy/paste evilness with TSRM_CC/DC
(tests still pass but would be nice to speed them up...)

diff --git a/ext/phar/phar_internal.h b/ext/phar/phar_internal.h
index a14c707a9e7603830b4b817323996cd9405d55a5..f4f1f6e2a05cf5393176ba123bb08f9522a19fea 100755 (executable)
--- a/ext/phar/phar_internal.h
+++ b/ext/phar/phar_internal.h
@@ -374,7 +374,7 @@ static inline void phar_set_entrypufp(phar_entry_info *entry, php_stream *fp TSR
        PHAR_GLOBALS->cached_fp[entry->phar->phar_pos].ufp = fp;
 }
 
-static inline php_stream *phar_get_pharfp(phar_archive_data *phar TSRMLS_CC)
+static inline php_stream *phar_get_pharfp(phar_archive_data *phar TSRMLS_DC)
 {
        if (!phar->is_persistent) {
                return phar->fp;
@@ -382,7 +382,7 @@ static inline php_stream *phar_get_pharfp(phar_archive_data *phar TSRMLS_CC)
        return PHAR_GLOBALS->cached_fp[phar->phar_pos].fp;
 }
 
-static inline php_stream *phar_get_pharufp(phar_archive_data *phar TSRMLS_CC)
+static inline php_stream *phar_get_pharufp(phar_archive_data *phar TSRMLS_DC)
 {
        if (!phar->is_persistent) {
                return phar->ufp;

diff --git a/ext/phar/util.c b/ext/phar/util.c
index de1eb347196e46a367a58235b66caee2912b0441..780e60533aa3ec2c393f0e6b6b25d7f00eab8e1e 100644 (file)
--- a/ext/phar/util.c
+++ b/ext/phar/util.c
@@ -1883,7 +1883,7 @@ int phar_create_signature(phar_archive_data *phar, php_stream *fp, char **signat
  */
 static int phar_add_empty(HashTable *ht, char *arKey, uint nKeyLength)  /* {{{ */
 {
-       void *dummy = (char *) 1;
+       char *dummy = (char*)1;
        if (SUCCESS == zend_hash_find(ht, arKey, nKeyLength, (void **)&dummy)) {
                dummy++;
        }
@@ -1912,7 +1912,7 @@ void phar_delete_virtual_dirs(phar_archive_data *phar, char *filename, int filen
        /* we use filename_len - 1 to avoid adding a virtual dir for empty directory entries */
        for (; s - filename < filename_len - 1; s++) {
                if (*s == '/') {
-                       void *dummy;
+                       char *dummy;
                        if (FAILURE == zend_hash_find(&phar->virtual_dirs, filename, s - filename, (void **)&dummy)) {
                                continue;
                        }