diff options
| author | Zeev Suraski <zeev@php.net> | 2001-07-27 10:16:41 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 2001-07-27 10:16:41 +0000 |
| commit | fe6f8712a439c8b5046a03bca9ce5ae8e75aa4f5 (patch) | |
| tree | c7bc98cac58386828871aae860f90cac0ebdcf8f /sapi/roxen | |
| parent | 2c254ba762d9392a732d5793b5b193ee6e395f1c (diff) | |
| download | php-git-fe6f8712a439c8b5046a03bca9ce5ae8e75aa4f5.tar.gz | |
- Get rid of ELS_*(), and use TSRMLS_*() instead.
- Move to the new ts_allocate_id() API
This patch is *bound* to break some files, as I must have had typos somewhere.
If you use any uncommon extension, please try to build it...
Diffstat (limited to 'sapi/roxen')
| -rw-r--r-- | sapi/roxen/roxen.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sapi/roxen/roxen.c b/sapi/roxen/roxen.c index 3aeed484d3..407cba1989 100644 --- a/sapi/roxen/roxen.c +++ b/sapi/roxen/roxen.c @@ -528,7 +528,7 @@ static sapi_module_struct roxen_sapi_module = { &pval, sizeof(zval *), NULL) static void -php_roxen_hash_environment(CLS_D ELS_DC PLS_DC SLS_DC) +php_roxen_hash_environment(CLS_D TSRMLS_DC PLS_DC SLS_DC) { int i; char buf[512]; @@ -586,7 +586,7 @@ static int php_roxen_module_main(SLS_D) #ifdef ZTS CLS_FETCH(); PLS_FETCH(); - ELS_FETCH(); + TSRMLS_FETCH(); #ifdef ROXEN_USE_ZTS GET_THIS(); #endif @@ -598,14 +598,14 @@ static int php_roxen_module_main(SLS_D) file_handle.opened_path = NULL; THREADS_ALLOW(); - res = php_request_startup(CLS_C ELS_CC PLS_CC SLS_CC); + res = php_request_startup(CLS_C TSRMLS_CC PLS_CC SLS_CC); THREADS_DISALLOW(); if(res == FAILURE) { return 0; } - php_roxen_hash_environment(CLS_C ELS_CC PLS_CC SLS_CC); + php_roxen_hash_environment(CLS_C TSRMLS_CC PLS_CC SLS_CC); THREADS_ALLOW(); - php_execute_script(&file_handle CLS_CC ELS_CC PLS_CC); + php_execute_script(&file_handle CLS_CC TSRMLS_CC PLS_CC); php_request_shutdown(NULL); THREADS_DISALLOW(); return 1; @@ -705,7 +705,7 @@ void pike_module_init( void ) #ifdef ZTS tsrm_startup(1, 1, 0, NULL); #ifdef ROXEN_USE_ZTS - roxen_globals_id = ts_allocate_id(sizeof(php_roxen_request), NULL, NULL); + ts_allocate_id(&roxen_globals_id, sizeof(php_roxen_request), NULL, NULL); #endif #endif sapi_startup(&roxen_sapi_module); |