3 files changed, 9 insertions, 9 deletions
diff --git a/ext/session/mod_user.c b/ext/session/mod_user.c
index be4e89d50e..0d8ebbc277 100644
--- a/ext/session/mod_user.c
+++ b/ext/session/mod_user.c
@@ -55,7 +55,7 @@ static zval *ps_call_handler(zval *func, int argc, zval **argv)
 {
 	int i;
 	zval *retval = NULL;
-	ELS_FETCH();
+	TSRMLS_FETCH();
 	
 	MAKE_STD_ZVAL(retval);
 	if (call_user_function(EG(function_table), NULL, func, retval, 
diff --git a/ext/session/php_session.h b/ext/session/php_session.h
index 223b81e61f..92aea61cc9 100644
--- a/ext/session/php_session.h
+++ b/ext/session/php_session.h
@@ -164,7 +164,7 @@ void session_adapt_flush(int (*)(const char *, uint));
 #endif
 
 void php_set_session_var(char *name, size_t namelen, zval *state_val,HashTable *var_hash PSLS_DC);
-int php_get_session_var(char *name, size_t namelen, zval ***state_var PLS_DC PSLS_DC ELS_DC);
+int php_get_session_var(char *name, size_t namelen, zval ***state_var PLS_DC PSLS_DC TSRMLS_DC);
 
 int php_session_register_module(ps_module *);
 
@@ -187,7 +187,7 @@ int php_session_register_serializer(const char *name,
 	ulong key_length;											\
 	ulong num_key;												\
 	zval **struc;												\
-	ELS_FETCH();												\
+	TSRMLS_FETCH();												\
 	PLS_FETCH()
 
 #define PS_ENCODE_LOOP(code)										\
@@ -195,7 +195,7 @@ int php_session_register_serializer(const char *name,
 			zend_hash_get_current_key_ex(&PS(vars), &key, &key_length, &num_key, 0, NULL) == HASH_KEY_IS_STRING; \
 			zend_hash_move_forward(&PS(vars))) {				\
 			key_length--;										\
-		if (php_get_session_var(key, key_length, &struc PLS_CC PSLS_CC ELS_CC) == SUCCESS) { \
+		if (php_get_session_var(key, key_length, &struc PLS_CC PSLS_CC TSRMLS_CC) == SUCCESS) { \
 			code;		 										\
 		} 														\
 	}
diff --git a/ext/session/session.c b/ext/session/session.c
index 831866df44..22ffbf3c60 100644
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -234,7 +234,7 @@ typedef struct {
 void php_set_session_var(char *name, size_t namelen, zval *state_val,HashTable *var_hash PSLS_DC)
 {
 	PLS_FETCH();
-	ELS_FETCH();
+	TSRMLS_FETCH();
 
 	if (PG(register_globals)) {
 		zval **old_symbol;
@@ -267,7 +267,7 @@ void php_set_session_var(char *name, size_t namelen, zval *state_val,HashTable *
 	}
 }
 
-int php_get_session_var(char *name, size_t namelen, zval ***state_var PLS_DC PSLS_DC ELS_DC)
+int php_get_session_var(char *name, size_t namelen, zval ***state_var PLS_DC PSLS_DC TSRMLS_DC)
 {
 	HashTable *ht = &EG(symbol_table);
 
@@ -448,7 +448,7 @@ static void php_session_track_init(void)
 {
 	zval **old_vars = NULL;
 	PSLS_FETCH();
-	ELS_FETCH();
+	TSRMLS_FETCH();
 
 	if (zend_hash_find(&EG(symbol_table), "HTTP_SESSION_VARS", sizeof("HTTP_SESSION_VARS"), (void **)&old_vars) == SUCCESS && Z_TYPE_PP(old_vars) == IS_ARRAY) {
 	  PS(http_session_vars) = *old_vars;
@@ -809,7 +809,7 @@ static void php_session_start(PSLS_D)
 	int module_number = PS(module_number);
 	int nrand;
 	int lensess;
-	ELS_FETCH();
+	TSRMLS_FETCH();
 
 	if (PS(session_status) != php_session_none) 
 		return;
@@ -1448,7 +1448,7 @@ PHP_MINIT_FUNCTION(session)
 #ifdef ZTS
 	php_ps_globals *ps_globals;
 
-	ps_globals_id = ts_allocate_id(sizeof(php_ps_globals), NULL, NULL);
+	ts_allocate_id(&ps_globals_id, sizeof(php_ps_globals), NULL, NULL);
 	ps_globals = ts_resource(ps_globals_id);
 #endif