Z_TYPE(filehandle)?? ok.. whatever... ;)

diff --git a/main/fopen_wrappers.c b/main/fopen_wrappers.c
index 853a7fb558c46f4b264a5e92df1d0b0be5a34a2c..4182d80c3329c4d9bade34ed23f13c8d432e9351 100644 (file)
--- a/main/fopen_wrappers.c
+++ b/main/fopen_wrappers.c
@@ -360,7 +360,7 @@ PHPAPI int php_fopen_primary_script(zend_file_handle *file_handle TSRMLS_DC)
        file_handle->filename = SG(request_info).path_translated;
        file_handle->free_filename = 0;
        file_handle->handle.fp = fp;
-       Z_TYPE_P(file_handle) = ZEND_HANDLE_FP;
+       file_handle->type = ZEND_HANDLE_FP;
 
        return SUCCESS;
 }

diff --git a/main/main.c b/main/main.c
index 8aa0d56b086e2b9f96f7861a61afe06f837e830e..20ee57a25dc1a7c26e0c28cfdb24ce5a6e40798d 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -1282,7 +1282,7 @@ PHPAPI int php_execute_script(zend_file_handle *primary_file TSRMLS_DC)
 
                PG(during_request_startup) = 0;
 
-               if (Z_TYPE_P(primary_file) == ZEND_HANDLE_FILENAME 
+               if (primary_file->type == ZEND_HANDLE_FILENAME 
                                && primary_file->filename) {
                        VCWD_GETCWD(old_cwd, OLD_CWD_SIZE-1);
                        VCWD_CHDIR_FILE(primary_file->filename);
@@ -1292,7 +1292,7 @@ PHPAPI int php_execute_script(zend_file_handle *primary_file TSRMLS_DC)
                        prepend_file.filename = PG(auto_prepend_file);
                        prepend_file.opened_path = NULL;
                        prepend_file.free_filename = 0;
-                       Z_TYPE(prepend_file) = ZEND_HANDLE_FILENAME;
+                       prepend_file.type = ZEND_HANDLE_FILENAME;
                        prepend_file_p = &prepend_file;
                } else {
                        prepend_file_p = NULL;
@@ -1301,7 +1301,7 @@ PHPAPI int php_execute_script(zend_file_handle *primary_file TSRMLS_DC)
                        append_file.filename = PG(auto_append_file);
                        append_file.opened_path = NULL;
                        append_file.free_filename = 0;
-                       Z_TYPE(append_file) = ZEND_HANDLE_FILENAME;
+                       append_file.type = ZEND_HANDLE_FILENAME;
                        append_file_p = &append_file;
                } else {
                        append_file_p = NULL;

diff --git a/main/php_ini.c b/main/php_ini.c
index 687e32ca0bf316731a1fe2f360affde38d4712eb..9531581d10bf659673d9ddcf19202f4ca5de6e18 100644 (file)
--- a/main/php_ini.c
+++ b/main/php_ini.c
@@ -262,7 +262,7 @@ int php_init_config(char *php_ini_path_override)
        if (!fh.handle.fp) {
                return SUCCESS;  /* having no configuration file is ok */
        }
-       Z_TYPE(fh) = ZEND_HANDLE_FP;
+       fh.type = ZEND_HANDLE_FP;
        fh.filename = php_ini_opened_path;
 
        zend_parse_ini_file(&fh, 1, php_config_ini_parser_cb, &extension_lists);