diff options
Diffstat (limited to 'ext/standard')
| -rw-r--r-- | ext/standard/assert.c | 3 | ||||
| -rw-r--r-- | ext/standard/basic_functions.c | 9 | ||||
| -rw-r--r-- | ext/standard/dir.c | 2 | ||||
| -rw-r--r-- | ext/standard/incomplete_class.c | 2 | ||||
| -rw-r--r-- | ext/standard/pack.h | 2 | ||||
| -rw-r--r-- | ext/standard/php_browscap.h | 4 | ||||
| -rw-r--r-- | ext/standard/php_crypt.h | 4 | ||||
| -rw-r--r-- | ext/standard/string.c | 1 |
8 files changed, 13 insertions, 14 deletions
diff --git a/ext/standard/assert.c b/ext/standard/assert.c index e7c2b3fd61..74486b60ac 100644 --- a/ext/standard/assert.c +++ b/ext/standard/assert.c @@ -83,7 +83,6 @@ static void php_assert_init_globals(php_assert_globals *assert_globals_p TSRMLS_ PHP_MINIT_FUNCTION(assert) { - #ifdef ZTS ts_allocate_id(&assert_globals_id, sizeof(php_assert_globals), (ts_allocate_ctor) php_assert_init_globals, NULL); #else @@ -160,7 +159,7 @@ PHP_FUNCTION(assert) EG(error_reporting) = 0; } - compiled_string_description = zend_make_compiled_string_description("assert code"); + compiled_string_description = zend_make_compiled_string_description("assert code" TSRMLS_CC); if (zend_eval_string(myeval, &retval, compiled_string_description TSRMLS_CC) == FAILURE) { efree(compiled_string_description); zend_error(E_ERROR, "Failure evaluating code:\n%s\n", myeval); diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index aa04d039f4..4fc830ab01 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -1879,7 +1879,7 @@ void php_call_shutdown_functions(void) TSRMLS_FETCH(); if (BG(user_shutdown_function_names)) zend_try { - zend_hash_apply(BG(user_shutdown_function_names), (apply_func_t)user_shutdown_function_call); + zend_hash_apply(BG(user_shutdown_function_names), (apply_func_t) user_shutdown_function_call); memcpy(&EG(bailout), &orig_bailout, sizeof(jmp_buf)); zend_hash_destroy(BG(user_shutdown_function_names)); efree(BG(user_shutdown_function_names)); @@ -1965,7 +1965,7 @@ PHP_FUNCTION(highlight_string) php_get_highlight_struct(&syntax_highlighter_ini); - hicompiled_string_description = zend_make_compiled_string_description("highlighted code"); + hicompiled_string_description = zend_make_compiled_string_description("highlighted code" TSRMLS_CC); if (highlight_string(*expr, &syntax_highlighter_ini, hicompiled_string_description)==FAILURE) { efree(hicompiled_string_description); @@ -2086,16 +2086,17 @@ void test_class_call_function(INTERNAL_FUNCTION_PARAMETERS, zend_property_refere } -void test_class_startup() +void test_class_startup(void) { zend_class_entry test_class_entry; + TSRMLS_FETCH(); INIT_OVERLOADED_CLASS_ENTRY(test_class_entry, "OverloadedTestClass", NULL, test_class_call_function, test_class_get_property, test_class_set_property); - zend_register_internal_class(&test_class_entry); + zend_register_internal_class(&test_class_entry TSRMLS_CC); } /* {{{ proto string ini_get(string varname) diff --git a/ext/standard/dir.c b/ext/standard/dir.c index 8104744116..32bbaf9698 100644 --- a/ext/standard/dir.c +++ b/ext/standard/dir.c @@ -122,7 +122,7 @@ PHP_MINIT_FUNCTION(dir) le_dirp = zend_register_list_destructors_ex(_dir_dtor, NULL, "dir", module_number); INIT_CLASS_ENTRY(dir_class_entry, "Directory", php_dir_class_functions); - dir_class_entry_ptr = zend_register_internal_class(&dir_class_entry); + dir_class_entry_ptr = zend_register_internal_class(&dir_class_entry TSRMLS_CC); #ifdef ZTS ts_allocate_id(&dir_globals_id, sizeof(php_dir_globals), NULL, NULL); diff --git a/ext/standard/incomplete_class.c b/ext/standard/incomplete_class.c index 4fd4d786f7..44470006f1 100644 --- a/ext/standard/incomplete_class.c +++ b/ext/standard/incomplete_class.c @@ -97,7 +97,7 @@ zend_class_entry *php_create_incomplete_class(TSRMLS_D) incomplete_class_get_property, incomplete_class_set_property); - BG(incomplete_class) = zend_register_internal_class(&incomplete_class); + BG(incomplete_class) = zend_register_internal_class(&incomplete_class TSRMLS_CC); return (BG(incomplete_class)); } diff --git a/ext/standard/pack.h b/ext/standard/pack.h index 76f4375c8f..681331619d 100644 --- a/ext/standard/pack.h +++ b/ext/standard/pack.h @@ -21,7 +21,7 @@ #ifndef PACK_H #define PACK_H -extern PHP_MINIT_FUNCTION(pack); +PHP_MINIT_FUNCTION(pack); PHP_FUNCTION(pack); PHP_FUNCTION(unpack); diff --git a/ext/standard/php_browscap.h b/ext/standard/php_browscap.h index 590d384c83..52436b459a 100644 --- a/ext/standard/php_browscap.h +++ b/ext/standard/php_browscap.h @@ -21,8 +21,8 @@ #ifndef PHP_BROWSCAP_H #define PHP_BROWSCAP_H -extern PHP_MINIT_FUNCTION(browscap); -extern PHP_MSHUTDOWN_FUNCTION(browscap); +PHP_MINIT_FUNCTION(browscap); +PHP_MSHUTDOWN_FUNCTION(browscap); PHP_FUNCTION(get_browser); diff --git a/ext/standard/php_crypt.h b/ext/standard/php_crypt.h index 4869ccf43e..b4b04bbd51 100644 --- a/ext/standard/php_crypt.h +++ b/ext/standard/php_crypt.h @@ -25,8 +25,8 @@ PHP_FUNCTION(crypt); #if HAVE_CRYPT -extern PHP_MINIT_FUNCTION(crypt); -extern PHP_RINIT_FUNCTION(crypt); +PHP_MINIT_FUNCTION(crypt); +PHP_RINIT_FUNCTION(crypt); #endif #endif diff --git a/ext/standard/string.c b/ext/standard/string.c index c336da544a..89014fecc0 100644 --- a/ext/standard/string.c +++ b/ext/standard/string.c @@ -151,7 +151,6 @@ struct lconv *localeconv_r(struct lconv *out) PHP_MINIT_FUNCTION(localeconv) { locale_mutex = tsrm_mutex_alloc(); - return SUCCESS; } /* }}} */ |