cvs: pecl /apc apc_compile.c apc_compile.h apc_main.c

sebastian Thu Feb 23 18:26:01 2006 UTC Modified files: /pecl/apc apc_compile.c apc_compile.h apc_main.c Log: Fix ZTS build. http://cvs.php.net/viewcvs.cgi/pecl/apc/apc_compile.c?r1=3.36&r2=3.37&diff_format=u Index: pecl/apc/apc_compile.c diff -u pecl/apc/apc_compile.c:3.36 pecl/apc/apc_compile.c:3.37 --- pecl/apc/apc_compile.c:3.36 Thu Feb 23 15:39:17 2006 +++ pecl/apc/apc_compile.c Thu Feb 23 18:26:01 2006 @@ -28,7 +28,7 @@ */ -/* $Id: apc_compile.c,v 3.36 2006/02/23 15:39:17 rasmus Exp $ */ +/* $Id: apc_compile.c,v 3.37 2006/02/23 18:26:01 sebastian Exp $ */ #include "apc_compile.h" #include "apc_globals.h" @@ -1777,7 +1777,7 @@ #ifdef ZEND_ENGINE_2 /* {{{ my_fetch_global_vars */ -void my_fetch_global_vars(zend_op_array* src) +void my_fetch_global_vars(zend_op_array* src TSRMLS_DC) { /* all jit_initialization variables (like $_SERVER) are created on demand due to a fetch_simple_variable called during parsing. @@ -1802,13 +1802,13 @@ #endif /* {{{ apc_copy_op_array_for_execution */ -zend_op_array* apc_copy_op_array_for_execution(zend_op_array* src) +zend_op_array* apc_copy_op_array_for_execution(zend_op_array* src TSRMLS_DC) { zend_op_array* dst = (zend_op_array*) emalloc(sizeof(src[0])); memcpy(dst, src, sizeof(src[0])); dst->static_variables = my_copy_static_variables(src, apc_php_malloc, apc_php_free); #ifdef ZEND_ENGINE_2 - my_fetch_global_vars(dst); + my_fetch_global_vars(dst TSRMLS_CC); #endif /*check_op_array_integrity(dst);*/ return dst; @@ -1816,13 +1816,13 @@ /* }}} */ /* {{{ apc_copy_function_for_execution */ -zend_function* apc_copy_function_for_execution(zend_function* src) +zend_function* apc_copy_function_for_execution(zend_function* src TSRMLS_DC) { zend_function* dst = (zend_function*) emalloc(sizeof(src[0])); memcpy(dst, src, sizeof(src[0])); dst->op_array.static_variables = my_copy_static_variables(&dst->op_array, apc_php_malloc, apc_php_free); #ifdef ZEND_ENGINE_2 - my_fetch_global_vars(&dst->op_array); + my_fetch_global_vars(&dst->op_array TSRMLS_CC); #endif /*check_op_array_integrity(&dst->op_array);*/ return dst; @@ -1830,10 +1830,10 @@ /* }}} */ /* {{{ apc_copy_function_for_execution_ex */ -zend_function* apc_copy_function_for_execution_ex(void *dummy, zend_function* src) +zend_function* apc_copy_function_for_execution_ex(void *dummy, zend_function* src TSRMLS_DC) { if(src->type==ZEND_INTERNAL_FUNCTION || src->type==ZEND_OVERLOADED_FUNCTION) return src; - return apc_copy_function_for_execution(src); + return apc_copy_function_for_execution(src TSRMLS_CC); } /* }}} */ http://cvs.php.net/viewcvs.cgi/pecl/apc/apc_compile.h?r1=3.8&r2=3.9&diff_format=u Index: pecl/apc/apc_compile.h diff -u pecl/apc/apc_compile.h:3.8 pecl/apc/apc_compile.h:3.9 --- pecl/apc/apc_compile.h:3.8 Thu Jun 23 09:10:35 2005 +++ pecl/apc/apc_compile.h Thu Feb 23 18:26:01 2006 @@ -27,7 +27,7 @@ */ -/* $Id: apc_compile.h,v 3.8 2005/06/23 09:10:35 rasmus Exp $ */ +/* $Id: apc_compile.h,v 3.9 2006/02/23 18:26:01 sebastian Exp $ */ #ifndef APC_COMPILE_H #define APC_COMPILE_H @@ -87,8 +87,8 @@ * structures. */ -extern zend_op_array* apc_copy_op_array_for_execution(zend_op_array* src); -extern zend_function* apc_copy_function_for_execution(zend_function* src); +extern zend_op_array* apc_copy_op_array_for_execution(zend_op_array* src TSRMLS_DC); +extern zend_function* apc_copy_function_for_execution(zend_function* src TSRMLS_DC); extern zend_class_entry* apc_copy_class_entry_for_execution(zend_class_entry* src, int is_derived); #endif http://cvs.php.net/viewcvs.cgi/pecl/apc/apc_main.c?r1=3.66&r2=3.67&diff_format=u Index: pecl/apc/apc_main.c diff -u pecl/apc/apc_main.c:3.66 pecl/apc/apc_main.c:3.67 --- pecl/apc/apc_main.c:3.66 Thu Dec 15 17:22:04 2005 +++ pecl/apc/apc_main.c Thu Feb 23 18:26:01 2006 @@ -28,7 +28,7 @@ */ -/* $Id: apc_main.c,v 3.66 2005/12/15 17:22:04 rasmus Exp $ */ +/* $Id: apc_main.c,v 3.67 2006/02/23 18:26:01 sebastian Exp $ */ #include "apc_php.h" #include "apc_main.h" @@ -74,7 +74,7 @@ zend_hash_add(EG(function_table), fn.name, fn.name_len+1, - apc_copy_function_for_execution(fn.function), + apc_copy_function_for_execution(fn.function TSRMLS_CC), sizeof(fn.function[0]), NULL); @@ -191,7 +191,7 @@ } } - return apc_copy_op_array_for_execution(cache_entry->data.file.op_array); + return apc_copy_op_array_for_execution(cache_entry->data.file.op_array TSRMLS_CC); } /* }}} */