diff options
| author | Felipe Pena <felipe@php.net> | 2011-10-13 22:56:05 +0000 |
|---|---|---|
| committer | Felipe Pena <felipe@php.net> | 2011-10-13 22:56:05 +0000 |
| commit | 1694d7876958df611955fb2876171a20eb5a6a56 (patch) | |
| tree | f5f18aa4ec1db027048fa7c9c551ce0704aa93ae /ext/sockets | |
| parent | 83ca3c8ff9bfcc32c364ed8e9a451a0575c10e83 (diff) | |
| download | php-git-1694d7876958df611955fb2876171a20eb5a6a56.tar.gz | |
- Fixed bug #60048 (sa_len a #define on IRIX)
patch by: china at thewrittenword dot com
Diffstat (limited to 'ext/sockets')
| -rw-r--r-- | ext/sockets/sockets.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/sockets/sockets.c b/ext/sockets/sockets.c index eb0db1e5c8..d1dd28a4f8 100644 --- a/ext/sockets/sockets.c +++ b/ext/sockets/sockets.c @@ -884,7 +884,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; @@ -892,7 +892,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; } |