From: Pierre Joye <pajoye@php.net>
Date: Wed, 18 Jun 2008 10:20:47 +0000 (+0000)
Subject: - really fix the windows builds, don't cast many times when only the hash function... 
X-Git-Tag: php-5.3.0alpha1~726
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e5e9be2d1aeb3a22933639541b14c734f32c430a;p=php

- really fix the windows builds, don't cast many times when only the hash function requires void **
- 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 a14c707a9e..f4f1f6e2a0 100755
--- 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 de1eb34719..780e60533a 100644
--- 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;
 			}