From cce94408e6f9cd18139b7fb82b588c8db89ab0e7 Mon Sep 17 00:00:00 2001 From: Felipe Pena Date: Thu, 13 Oct 2011 22:56:05 +0000 Subject: [PATCH] - Fixed bug #60048 (sa_len a #define on IRIX) patch by: china at thewrittenword dot com --- ext/sockets/sockets.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ext/sockets/sockets.c b/ext/sockets/sockets.c index 9c034a3f27..897c330841 100644 --- a/ext/sockets/sockets.c +++ b/ext/sockets/sockets.c @@ -1052,7 +1052,7 @@ PHP_FUNCTION(socket_accept) zval *arg1; php_socket *php_sock, *new_sock; php_sockaddr_storage sa; - socklen_t sa_len = sizeof(sa); + socklen_t php_sa_len = sizeof(sa); if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &arg1) == FAILURE) { return; @@ -1060,7 +1060,7 @@ PHP_FUNCTION(socket_accept) ZEND_FETCH_RESOURCE(php_sock, php_socket *, &arg1, -1, le_socket_name, le_socket); - if (!php_accept_connect(php_sock, &new_sock, (struct sockaddr*)&sa, &sa_len TSRMLS_CC)) { + if (!php_accept_connect(php_sock, &new_sock, (struct sockaddr*)&sa, &php_sa_len TSRMLS_CC)) { RETURN_FALSE; } -- 2.50.1