Cleanup patches

8 files changed, 4 insertions, 14 deletions

diff --git a/ext/standard/array.c b/ext/standard/array.c
index 5f29f0546b..d8a07b5f9b 100644
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -112,8 +112,6 @@ zend_module_entry array_module_entry = {
 
 PHP_MINIT_FUNCTION(array)
 {
-	ELS_FETCH();
-
 #ifdef ZTS
     array_globals_id = ts_allocate_id(sizeof(php_array_globals), NULL, NULL);
 #endif
diff --git a/ext/standard/assert.c b/ext/standard/assert.c
index b64860cd7e..355be782cb 100644
--- a/ext/standard/assert.c
+++ b/ext/standard/assert.c
@@ -103,7 +103,6 @@ PHP_MINIT_FUNCTION(assert)
 {
 
 #ifdef ZTS
-	ELS_FETCH();
 	assert_globals_id = ts_allocate_id(sizeof(php_assert_globals), (ts_allocate_ctor) php_assert_init_globals, NULL);
 #else
 	php_assert_init_globals(ASSERTLS_C);
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index f7c0a1745c..05c0768731 100644
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -405,9 +405,8 @@ static void basic_globals_dtor(BLS_D)
 
 PHP_MINIT_FUNCTION(basic)
 {
-	ELS_FETCH();
 #ifdef ZTS
-	basic_globals_id = ts_allocate_id(sizeof(php_basic_globals), (ts_allocate_ctor) basic_globals_ctor, basic_globals_dtor);
+	basic_globals_id = ts_allocate_id(sizeof(php_basic_globals), (ts_allocate_ctor) basic_globals_ctor, (ts_allocate_dtor) basic_globals_dtor);
 #else
 	basic_globals_ctor(BLS_C);
 #endif
diff --git a/ext/standard/crypt.c b/ext/standard/crypt.c
index 148bbd7e40..a3fe1d4da7 100644
--- a/ext/standard/crypt.c
+++ b/ext/standard/crypt.c
@@ -92,8 +92,6 @@ zend_module_entry crypt_module_entry = {
 
 PHP_MINIT_FUNCTION(crypt)
 {
-	ELS_FETCH();
-
 #if PHP3_STD_DES_CRYPT
     REGISTER_LONG_CONSTANT("CRYPT_SALT_LENGTH", 2, CONST_CS | CONST_PERSISTENT);
 #else
diff --git a/ext/standard/dl.c b/ext/standard/dl.c
index 6dc731ef5c..471ef75e9a 100644
--- a/ext/standard/dl.c
+++ b/ext/standard/dl.c
@@ -87,6 +87,7 @@ void php_dl(pval *file,int type,pval *return_value)
 	zend_module_entry *module_entry,*tmp;
 	zend_module_entry *(*get_module)(void);
 	PLS_FETCH();
+	ELS_FETCH();
 	
 	if (cfg_get_string("extension_dir",&PG(extension_dir))==SUCCESS
 		&& PG(extension_dir)
@@ -130,7 +131,7 @@ void php_dl(pval *file,int type,pval *return_value)
 	module_entry->type = type;
 	module_entry->module_number = zend_next_free_module();
 	if (module_entry->module_startup_func) {
-		if (module_entry->module_startup_func(type, module_entry->module_number)==FAILURE) {
+		if (module_entry->module_startup_func(type, module_entry->module_number ELS_CC)==FAILURE) {
 			php_error(E_CORE_WARNING,"%s:  Unable to initialize module",module_entry->name);
 			dlclose(handle);
 			RETURN_FALSE;
@@ -140,7 +141,7 @@ void php_dl(pval *file,int type,pval *return_value)
 
 
 	if (module_entry->request_startup_func) {
-		if (module_entry->request_startup_func(type, module_entry->module_number)) {
+		if (module_entry->request_startup_func(type, module_entry->module_number ELS_CC)) {
 			php_error(E_CORE_WARNING,"%s:  Unable to initialize module",module_entry->name);
 			dlclose(handle);
 			RETURN_FALSE;
diff --git a/ext/standard/html.c b/ext/standard/html.c
index a8f4ca150a..4d86ada6d3 100644
--- a/ext/standard/html.c
+++ b/ext/standard/html.c
@@ -100,7 +100,6 @@ static void php_html_entities(INTERNAL_FUNCTION_PARAMETERS, int all)
 
 void register_html_constants(INIT_FUNC_ARGS)
 {
-	ELS_FETCH();
 	REGISTER_LONG_CONSTANT("HTML_SPECIALCHARS", HTML_SPECIALCHARS, CONST_PERSISTENT|CONST_CS);
 	REGISTER_LONG_CONSTANT("HTML_ENTITIES", HTML_ENTITIES, CONST_PERSISTENT|CONST_CS);
 }
diff --git a/ext/standard/info.c b/ext/standard/info.c
index 5dccf1be24..c4061ba809 100644
--- a/ext/standard/info.c
+++ b/ext/standard/info.c
@@ -430,8 +430,6 @@ PHPAPI void php_info_print_table_row(int num_cols, ...)
 
 void register_phpinfo_constants(INIT_FUNC_ARGS)
 {
-	ELS_FETCH();
-
 	REGISTER_LONG_CONSTANT("INFO_GENERAL", PHP_INFO_GENERAL, CONST_PERSISTENT|CONST_CS);
 	REGISTER_LONG_CONSTANT("INFO_CREDITS", PHP_INFO_CREDITS, CONST_PERSISTENT|CONST_CS);
 	REGISTER_LONG_CONSTANT("INFO_CONFIGURATION", PHP_INFO_CONFIGURATION, CONST_PERSISTENT|CONST_CS);
diff --git a/ext/standard/syslog.c b/ext/standard/syslog.c
index eaf0ce9286..bdbe2e690e 100644
--- a/ext/standard/syslog.c
+++ b/ext/standard/syslog.c
@@ -44,8 +44,6 @@ static void start_syslog(void);
 
 PHP_MINIT_FUNCTION(syslog)
 {
-	ELS_FETCH();
-	
 	/* error levels */
 	REGISTER_LONG_CONSTANT("LOG_EMERG", LOG_EMERG, CONST_CS | CONST_PERSISTENT); /* system unusable */
 	REGISTER_LONG_CONSTANT("LOG_ALERT", LOG_ALERT, CONST_CS | CONST_PERSISTENT); /* immediate action required */