cvs: php4 /ext/sockets sockets.c

jason Sat Mar 9 01:41:19 2002 EDT Modified files: /php4/ext/sockets sockets.c Log: Fix build on win32 Index: php4/ext/sockets/sockets.c diff -u php4/ext/sockets/sockets.c:1.96 php4/ext/sockets/sockets.c:1.97 --- php4/ext/sockets/sockets.c:1.96 Fri Mar 8 23:37:54 2002 +++ php4/ext/sockets/sockets.c Sat Mar 9 01:41:19 2002 @@ -19,7 +19,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sockets.c,v 1.96 2002/03/09 04:37:54 jason Exp $ */ +/* $Id: sockets.c,v 1.97 2002/03/09 06:41:19 jason Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -100,6 +100,9 @@ static unsigned char second_and_third_args_force_ref[] = {3, BYREF_NONE, BYREF_FORCE, BYREF_FORCE}; +static unsigned char second_arg_of_four_force_ref[] = +{4, BYREF_NONE, BYREF_FORCE, BYREF_NONE, BYREF_NONE}; + static unsigned char second_fifth_and_sixth_args_force_ref[] = {6, BYREF_NONE, BYREF_FORCE, BYREF_NONE, BYREF_NONE, BYREF_FORCE, BYREF_FORCE}; @@ -131,7 +134,7 @@ PHP_FE(socket_connect, NULL) PHP_FE(socket_strerror, NULL) PHP_FE(socket_bind, NULL) - PHP_FE(socket_recv, second_arg_force_ref) + PHP_FE(socket_recv, second_arg_of_four_force_ref) PHP_FE(socket_send, NULL) PHP_FE(socket_recvfrom, second_fifth_and_sixth_args_force_ref) PHP_FE(socket_sendto, NULL) @@ -432,7 +435,7 @@ } /* }}} */ -int php_sock_array_to_fd_set(zval *sock_array, fd_set *fds, int *max_fd TSRMLS_DC) { +int php_sock_array_to_fd_set(zval *sock_array, fd_set *fds, SOCKET *max_fd TSRMLS_DC) { zval **element; php_socket *php_sock; @@ -898,8 +901,6 @@ php_socket *php_sock; struct sockaddr_in sin; struct sockaddr_un s_un; - struct in_addr addr_buf; - struct hostent *host_struct; char *addr; int retval, addr_len, port; @@ -1384,7 +1385,6 @@ php_socket *php_sock; struct sockaddr_un s_un; struct sockaddr_in sin; - struct in_addr addr_buf; int retval, buf_len, len, flags, addr_len, port = 0; char *buf, *addr; @@ -1916,7 +1916,6 @@ { zval *arg1; php_socket *php_sock; - int error; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &arg1) == FAILURE) return;