diff options
| author | Sterling Hughes <sterling@php.net> | 2001-11-26 18:57:44 +0000 |
|---|---|---|
| committer | Sterling Hughes <sterling@php.net> | 2001-11-26 18:57:44 +0000 |
| commit | b91a66699cba1aabc63ba381fc7e31ff402ceffb (patch) | |
| tree | a7cf360193488b178f955de0675aebf11f0a4087 | |
| parent | 7cd6ccc0ec9beca50034276fe349d2666ec945cb (diff) | |
| download | php-git-b91a66699cba1aabc63ba381fc7e31ff402ceffb.tar.gz | |
Z_TYPE(filehandle)?? ok.. whatever... ;)
| -rw-r--r-- | main/fopen_wrappers.c | 2 | ||||
| -rw-r--r-- | main/main.c | 6 | ||||
| -rw-r--r-- | main/php_ini.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/main/fopen_wrappers.c b/main/fopen_wrappers.c index 853a7fb558..4182d80c33 100644 --- 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 8aa0d56b08..20ee57a25d 100644 --- 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 687e32ca0b..9531581d10 100644 --- 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); |