TODO: Remove storing TSRM info in _php_ssh2_session_data for now to f…

…ix ZTS build

php_ssh2.h

@@ -67,11 +67,6 @@ typedef struct _php_ssh2_session_data {
 	zval *disconnect_cb;
 
 	int socket;
-
-#ifdef ZTS
-	/* Avoid unnecessary TSRMLS_FETCH() calls */
-	//TSRMLS_D;
-#endif
 } php_ssh2_session_data;
 
 typedef struct _php_ssh2_sftp_data {
@@ -97,20 +92,6 @@ typedef struct _php_ssh2_pkey_subsys_data {
 	int session_rsrcid;
 } php_ssh2_pkey_subsys_data;
 
-#ifdef ZTS
-#define SSH2_TSRMLS_SET(datap)		((php_ssh2_session_data*)(datap))->tsrm_ls = TSRMLS_C
-#define SSH2_TSRMLS_FETCH(datap)	TSRMLS_D = ((php_ssh2_session_data*)(datap))->tsrm_ls;
-#else
-#define SSH2_TSRMLS_SET(datap)
-#define SSH2_TSRMLS_FETCH(datap)
-#endif
-
-#if (PHP_MAJOR_VERSION == 5) && (PHP_MINOR_VERSION >= 3)
-#define ZEND_IS_CALLABLE_TSRMLS_CC		TSRMLS_CC
-#else
-#define ZEND_IS_CALLABLE_TSRMLS_CC
-#endif
-
 #define SSH2_FETCH_NONAUTHENTICATED_SESSION(session, zsession) \
 if ((session = (LIBSSH2_SESSION *)zend_fetch_resource(Z_RES_P(zsession), PHP_SSH2_SESSION_RES_NAME, le_ssh2_session)) == NULL) { \
     RETURN_FALSE; \

ssh2.c

@@ -89,7 +89,6 @@ LIBSSH2_DEBUG_FUNC(php_ssh2_debug_cb)
 {
 	php_ssh2_session_data *data;
 	zval args[3];
-	SSH2_TSRMLS_FETCH(*abstract);
 
 	if (!abstract || !*abstract) {
 		return;
@@ -117,7 +116,6 @@ LIBSSH2_IGNORE_FUNC(php_ssh2_ignore_cb)
 	php_ssh2_session_data *data;
 	zval zretval;
 	zval args[1];
-	SSH2_TSRMLS_FETCH(*abstract);
 
 	if (!abstract || !*abstract) {
 		return;
@@ -148,7 +146,6 @@ LIBSSH2_MACERROR_FUNC(php_ssh2_macerror_cb)
 	zval zretval;
 	zval args[1];
 	int retval = -1;
-	SSH2_TSRMLS_FETCH(*abstract);
 
 	if (!abstract || !*abstract) {
 		return -1;
@@ -180,7 +177,6 @@ LIBSSH2_DISCONNECT_FUNC(php_ssh2_disconnect_cb)
 {
 	php_ssh2_session_data *data;
 	zval args[3];
-	SSH2_TSRMLS_FETCH(*abstract);
 
 	if (!abstract || !*abstract) {
 		return;
@@ -222,7 +218,7 @@ static int php_ssh2_set_callback(LIBSSH2_SESSION *session, HashTable *ht, char *
 	}
 	zend_string_release(callback_zstring);
 
-	if (!zend_is_callable(handler, 0, NULL ZEND_IS_CALLABLE_TSRMLS_CC)) {
+	if (!zend_is_callable(handler, 0, NULL)) {
 		return -1;
 	}
 
@@ -315,7 +311,6 @@ LIBSSH2_SESSION *php_ssh2_session_connect(char *host, int port, zval *methods, z
 	}
 
 	data = ecalloc(1, sizeof(php_ssh2_session_data));
-	SSH2_TSRMLS_SET(data);
 	data->socket = socket;
 
 	session = libssh2_session_init_ex(php_ssh2_alloc_cb, php_ssh2_free_cb, php_ssh2_realloc_cb, data);