diff options
| -rw-r--r-- | ext/curl/interface.c | 2 | ||||
| -rw-r--r-- | ext/openssl/openssl.c | 2 | ||||
| -rw-r--r-- | ext/phar/phar_object.c | 2 | ||||
| -rwxr-xr-x | ext/skeleton/create_stubs | 2 | ||||
| -rw-r--r-- | ext/spl/spl_directory.c | 2 | ||||
| -rw-r--r-- | ext/standard/iptc.c | 2 | ||||
| -rw-r--r-- | ext/zip/php_zip.c | 2 | ||||
| -rw-r--r-- | main/output.c | 4 |
8 files changed, 9 insertions, 9 deletions
diff --git a/ext/curl/interface.c b/ext/curl/interface.c index 8b9a756aa2..564d9fcb1c 100644 --- a/ext/curl/interface.c +++ b/ext/curl/interface.c @@ -2189,7 +2189,7 @@ static int _php_curl_setopt(php_curl *ch, zend_long option, zval *zvalue) /* {{{ #endif # if defined(ZTS) if (option == CURLOPT_DNS_USE_GLOBAL_CACHE) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "CURLOPT_DNS_USE_GLOBAL_CACHE cannot be activated when thread safety is enabled"); + php_error_docref(NULL, E_WARNING, "CURLOPT_DNS_USE_GLOBAL_CACHE cannot be activated when thread safety is enabled"); return 1; } # endif diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c index 464b0b8ca9..4a096f779a 100644 --- a/ext/openssl/openssl.c +++ b/ext/openssl/openssl.c @@ -4931,7 +4931,7 @@ PHP_FUNCTION(openssl_seal) iv_len = EVP_CIPHER_iv_length(cipher); if (!iv && iv_len > 0) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, + php_error_docref(NULL, E_WARNING, "Cipher algorithm requires an IV to be supplied as a sixth parameter"); RETURN_FALSE; } diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c index 51b8b13a2a..22404dddbc 100644 --- a/ext/phar/phar_object.c +++ b/ext/phar/phar_object.c @@ -4085,7 +4085,7 @@ static int phar_extract_file(zend_bool overwrite, phar_entry_info *entry, char * new_state.cwd[0] = DEFAULT_SLASH; new_state.cwd[1] = '\0'; new_state.cwd_length = 1; - if (virtual_file_ex(&new_state, entry->filename, NULL, CWD_EXPAND TSRMLS_CC) != 0 || + if (virtual_file_ex(&new_state, entry->filename, NULL, CWD_EXPAND) != 0 || new_state.cwd_length <= 1) { if (EINVAL == errno && entry->filename_len > 50) { char *tmp = estrndup(entry->filename, 50); diff --git a/ext/skeleton/create_stubs b/ext/skeleton/create_stubs index 1163908110..a3f3d196b3 100755 --- a/ext/skeleton/create_stubs +++ b/ext/skeleton/create_stubs @@ -195,7 +195,7 @@ END { if (maxargs[i]>0) { fetchargs = "\tif (zend_parse_parameters(" ints = ints "\tint argc = ZEND_NUM_ARGS();\n" - fetchargs = fetchargs "argc TSRMLS_CC, " specs[i] + fetchargs = fetchargs "argc, " specs[i] } else { fetchargs = fetchargs "\tif (zend_parse_parameters_none() == FAILURE) {\n\t\treturn;\n\t}" xmlparams = xmlparams " <void/>\n" diff --git a/ext/spl/spl_directory.c b/ext/spl/spl_directory.c index b0ee3bc7a3..412fc54324 100644 --- a/ext/spl/spl_directory.c +++ b/ext/spl/spl_directory.c @@ -834,7 +834,7 @@ SPL_METHOD(DirectoryIterator, seek) zval_ptr_dtor(&retval); } if (!valid) { - zend_throw_exception_ex(spl_ce_OutOfBoundsException, 0 TSRMLS_CC, "Seek position %ld is out of range", pos); + zend_throw_exception_ex(spl_ce_OutOfBoundsException, 0, "Seek position %ld is out of range", pos); return; } zend_call_method_with_0_params(&EX(This), Z_OBJCE(EX(This)), &intern->u.dir.func_next, "next", NULL); diff --git a/ext/standard/iptc.c b/ext/standard/iptc.c index 480da221a4..7e5a8987b4 100644 --- a/ext/standard/iptc.c +++ b/ext/standard/iptc.c @@ -206,7 +206,7 @@ PHP_FUNCTION(iptcembed) } if (iptcdata_len >= SIZE_MAX - sizeof(psheader) - 1025) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "IPTC data too large"); + php_error_docref(NULL, E_WARNING, "IPTC data too large"); RETURN_FALSE; } diff --git a/ext/zip/php_zip.c b/ext/zip/php_zip.c index 83c14b5836..6bb23ad85d 100644 --- a/ext/zip/php_zip.c +++ b/ext/zip/php_zip.c @@ -1506,7 +1506,7 @@ static ZIPARCHIVE_METHOD(close) ze_obj = Z_ZIP_P(self); if ((err = zip_close(intern))) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", zip_strerror(intern)); + php_error_docref(NULL, E_WARNING, "%s", zip_strerror(intern)); zip_discard(intern); } diff --git a/main/output.c b/main/output.c index 2154949810..2a51100960 100644 --- a/main/output.c +++ b/main/output.c @@ -665,7 +665,7 @@ PHPAPI int php_output_handler_alias_register(const char *name, size_t name_len, } /* }}} */ -/* {{{ SUCCESS|FAILURE php_output_handler_hook(php_output_handler_hook_t type, void *arg TSMRLS_DC) +/* {{{ SUCCESS|FAILURE php_output_handler_hook(php_output_handler_hook_t type, void *arg) * Output handler hook for output handler functions to check/modify the current handlers abilities */ PHPAPI int php_output_handler_hook(php_output_handler_hook_t type, void *arg) { @@ -715,7 +715,7 @@ PHPAPI void php_output_handler_dtor(php_output_handler *handler) } /* }}} */ -/* {{{ void php_output_handler_free(php_output_handler **handler TSMRLS_DC) +/* {{{ void php_output_handler_free(php_output_handler **handler) * Destroy and free an output handler */ PHPAPI void php_output_handler_free(php_output_handler **h) { |