1 files changed, 7 insertions, 13 deletions

diff --git a/ext/sockets/conversions.c b/ext/sockets/conversions.c
index d808271728..98ece64855 100644
--- a/ext/sockets/conversions.c
+++ b/ext/sockets/conversions.c
@@ -196,10 +196,10 @@ static void do_to_zval_err(res_context *ctx, const char *fmt, ...)
 	va_end(ap);
 }
 
-void err_msg_dispose(struct err_s *err TSRMLS_DC)
+void err_msg_dispose(struct err_s *err)
 {
 	if (err->msg != NULL) {
-		php_error_docref0(NULL TSRMLS_CC, err->level, "%s", err->msg);
+		php_error_docref0(NULL, err->level, "%s", err->msg);
 		if (err->should_free) {
 			efree(err->msg);
 		}
@@ -541,10 +541,9 @@ static void from_zval_write_sin_addr(const zval *zaddr_str, char *inaddr, ser_co
 	int					res;
 	struct sockaddr_in	saddr = {0};
 	zend_string			*addr_str;
-	TSRMLS_FETCH();
 
 	addr_str = zval_get_string((zval *) zaddr_str);
-	res = php_set_inet_addr(&saddr, addr_str->val, ctx->sock TSRMLS_CC);
+	res = php_set_inet_addr(&saddr, addr_str->val, ctx->sock);
 	if (res) {
 		memcpy(inaddr, &saddr.sin_addr, sizeof saddr.sin_addr);
 	} else {
@@ -592,10 +591,9 @@ static void from_zval_write_sin6_addr(const zval *zaddr_str, char *addr6, ser_co
 	int					res;
 	struct sockaddr_in6	saddr6 = {0};
 	zend_string			*addr_str;
-	TSRMLS_FETCH();
 
 	addr_str = zval_get_string((zval *) zaddr_str);
-	res = php_set_inet6_addr(&saddr6, addr_str->val, ctx->sock TSRMLS_CC);
+	res = php_set_inet6_addr(&saddr6, addr_str->val, ctx->sock);
 	if (res) {
 		memcpy(addr6, &saddr6.sin6_addr, sizeof saddr6.sin6_addr);
 	} else {
@@ -645,7 +643,6 @@ static void from_zval_write_sun_path(const zval *path, char *sockaddr_un_c, ser_
 {
 	zend_string			*path_str;
 	struct sockaddr_un	*saddr = (struct sockaddr_un*)sockaddr_un_c;
-	TSRMLS_FETCH();
 
 	path_str = zval_get_string((zval *) path);
 
@@ -1246,8 +1243,7 @@ static void from_zval_write_ifindex(const zval *zv, char *uinteger, ser_context
 		}
 	} else {
 		zend_string *str;
-		TSRMLS_FETCH();
-		
+			
 		str = zval_get_string((zval *) zv);
 
 #if HAVE_IF_NAMETOINDEX
@@ -1350,7 +1346,6 @@ size_t calculate_scm_rights_space(const zval *arr, ser_context *ctx)
 static void from_zval_write_fd_array_aux(zval *elem, unsigned i, void **args, ser_context *ctx)
 {
 	int *iarr = args[0];
-	TSRMLS_FETCH();
 
 	if (Z_TYPE_P(elem) == IS_RESOURCE) {
 		php_stream *stream;
@@ -1395,7 +1390,6 @@ void to_zval_read_fd_array(const char *data, zval *zv, res_context *ctx)
 					i;
 	struct cmsghdr	*dummy_cmsg = 0;
 	size_t			data_offset;
-	TSRMLS_FETCH();
 
 	data_offset = (unsigned char *)CMSG_DATA(dummy_cmsg)
 			- (unsigned char *)dummy_cmsg;
@@ -1428,8 +1422,8 @@ void to_zval_read_fd_array(const char *data, zval *zv, res_context *ctx)
 			return;
 		}
 		if (S_ISSOCK(statbuf.st_mode)) {
-			php_socket *sock = socket_import_file_descriptor(fd TSRMLS_CC);
-			zend_register_resource(&elem, sock, php_sockets_le_socket() TSRMLS_CC);
+			php_socket *sock = socket_import_file_descriptor(fd);
+			zend_register_resource(&elem, sock, php_sockets_le_socket());
 		} else {
 			php_stream *stream = php_stream_fopen_from_fd(fd, "rw", NULL);
 			php_stream_to_zval(stream, &elem);