diff options
Diffstat (limited to 'sapi/aolserver/aolserver.c')
| -rw-r--r-- | sapi/aolserver/aolserver.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sapi/aolserver/aolserver.c b/sapi/aolserver/aolserver.c index 81dbda5346..55b74b0233 100644 --- a/sapi/aolserver/aolserver.c +++ b/sapi/aolserver/aolserver.c @@ -305,13 +305,13 @@ php_ns_startup(sapi_module_struct *sapi_module) */ #define ADD_STRINGX(name,buf) \ - php_register_variable(name, buf, track_vars_array ELS_CC PLS_CC) + php_register_variable(name, buf, track_vars_array TSRMLS_CC PLS_CC) #define ADD_STRING(name) \ ADD_STRINGX(name, buf) static void -php_ns_sapi_register_variables(zval *track_vars_array ELS_DC SLS_DC PLS_DC) +php_ns_sapi_register_variables(zval *track_vars_array TSRMLS_DC SLS_DC PLS_DC) { int i; char buf[NS_BUF_SIZE + 1]; @@ -418,7 +418,7 @@ php_ns_module_main(NSLS_D SLS_DC) { zend_file_handle file_handle; CLS_FETCH(); - ELS_FETCH(); + TSRMLS_FETCH(); PLS_FETCH(); file_handle.type = ZEND_HANDLE_FILENAME; @@ -427,11 +427,11 @@ php_ns_module_main(NSLS_D SLS_DC) file_handle.opened_path = NULL; php_ns_config(global_context, 0); - if (php_request_startup(CLS_C ELS_CC PLS_CC SLS_CC) == FAILURE) { + if (php_request_startup(CLS_C TSRMLS_CC PLS_CC SLS_CC) == FAILURE) { return NS_ERROR; } - 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); return NS_OK; @@ -617,7 +617,7 @@ int Ns_ModuleInit(char *server, char *module) sapi_module.startup(&aolserver_sapi_module); /* TSRM is used to allocate a per-thread structure */ - ns_globals_id = ts_allocate_id(sizeof(ns_globals_struct), NULL, NULL); + ts_allocate_id(&ns_globals_id, sizeof(ns_globals_struct), NULL, NULL); /* the context contains data valid for all threads */ ctx = malloc(sizeof *ctx); |