Remove TSRMLS_* from code, they are not used anymore

diff --git a/ext/curl/interface.c b/ext/curl/interface.c
index 8b9a756aa28fb9d8bd99a0669539612ce8c3c3ab..564d9fcb1c70d5006fad4839dd07647a7dbb9a51 100644 (file)
--- 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 464b0b8ca9486d73bb3e7d1319b06170f1fcf943..4a096f779a67ab7ec560f194ae09bc660f379bc9 100644 (file)
--- 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 51b8b13a2ae9f5abb832a560f117f0e4c205ac92..22404dddbc2130648699dc9081b4b18083ba2f46 100644 (file)
--- 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 1163908110362df2554f6b9cf2890ef72a444afd..a3f3d196b3f5cd09140e1ae053124e0b92f22d9b 100755 (executable)
--- 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 b0ee3bc7a3d4ff5724a0e6fe4f954747ae1a865e..412fc543242ccd4dd5a2f871f6cc47d8b01827e6 100644 (file)
--- 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 480da221a4bb7613e43feea4db10860f3bc38d51..7e5a8987b4cb91475c74f059cd979e5aff3615f9 100644 (file)
--- 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 83c14b58369103717d839158d09471a4bb706e75..6bb23ad85dc38627369e0b4f46bbb7e5c754a69e 100644 (file)
--- 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 215494981089f707c85b44a6a5d9f570dd99b6aa..2a51100960c05e7bbaadd545dd07134479f9974b 100644 (file)
--- 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)
 {