summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2014-12-12 08:11:14 +0100
committerAnatol Belski <ab@php.net>2014-12-12 08:11:14 +0100
commitde99a94c384fdb6a71c20692df33dc24a2b81a4b (patch)
treed74188d283d239fe6826382408f87ffbc639cd57
parent22be00cb3c075514535d3470b573c47602a70eb4 (diff)
downloadphp-git-de99a94c384fdb6a71c20692df33dc24a2b81a4b.tar.gz
explicit passing of *tsrm_ls isn't needed anymore
-rw-r--r--TSRM/TSRM.c4
-rw-r--r--TSRM/TSRM.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/TSRM/TSRM.c b/TSRM/TSRM.c
index df831f31b8..67b7ff6002 100644
--- a/TSRM/TSRM.c
+++ b/TSRM/TSRM.c
@@ -286,7 +286,7 @@ static void allocate_new_resource(tsrm_tls_entry **thread_resources_ptr, THREAD_
tsrm_tls_set(*thread_resources_ptr);
if (tsrm_new_thread_begin_handler) {
- tsrm_new_thread_begin_handler(thread_id, &((*thread_resources_ptr)->storage));
+ tsrm_new_thread_begin_handler(thread_id);
}
for (i=0; i<id_count; i++) {
if (resource_types_table[i].done) {
@@ -301,7 +301,7 @@ static void allocate_new_resource(tsrm_tls_entry **thread_resources_ptr, THREAD_
}
if (tsrm_new_thread_end_handler) {
- tsrm_new_thread_end_handler(thread_id, &((*thread_resources_ptr)->storage));
+ tsrm_new_thread_end_handler(thread_id);
}
tsrm_mutex_unlock(tsmm_mutex);
diff --git a/TSRM/TSRM.h b/TSRM/TSRM.h
index e25e3048ad..83999c3521 100644
--- a/TSRM/TSRM.h
+++ b/TSRM/TSRM.h
@@ -129,8 +129,8 @@ TSRM_API void ts_free_id(ts_rsrc_id id);
#define TSRM_ERROR_LEVEL_CORE 2
#define TSRM_ERROR_LEVEL_INFO 3
-typedef void (*tsrm_thread_begin_func_t)(THREAD_T thread_id, void ***tsrm_ls);
-typedef void (*tsrm_thread_end_func_t)(THREAD_T thread_id, void ***tsrm_ls);
+typedef void (*tsrm_thread_begin_func_t)(THREAD_T thread_id);
+typedef void (*tsrm_thread_end_func_t)(THREAD_T thread_id);
TSRM_API int tsrm_error(int level, const char *format, ...);