From 69a4760b48a5e17c4cc2d2b8ac9c0aec968d3a48 Mon Sep 17 00:00:00 2001 From: Daniel Beulshausen Date: Wed, 25 Jul 2001 22:03:55 +0000 Subject: fix recently discovered api flaws - nuke first parameter to socket_select (detemine it ourself) - swap parameters for socket_fd_set, socket_fd_clear & socket_fd_isset - allow to pass an array of sockets to socket_fd_set + socket_fd_clear --- ext/sockets/php_sockets.h | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) (limited to 'ext/sockets/php_sockets.h') diff --git a/ext/sockets/php_sockets.h b/ext/sockets/php_sockets.h index 03f435e9b3..db0f55f9fe 100644 --- a/ext/sockets/php_sockets.h +++ b/ext/sockets/php_sockets.h @@ -78,21 +78,30 @@ PHP_FUNCTION(socket_setopt); PHP_FUNCTION(socket_shutdown); typedef struct php_iovec { - struct iovec *iov_array; - unsigned int count; + struct iovec *iov_array; + unsigned int count; } php_iovec_t; -typedef struct { -#ifdef PHP_WIN32 - SOCKET socket; -#else - int socket; +#ifndef PHP_WIN32 +typedef int SOCKET; #endif - int type; + +typedef struct { + SOCKET socket; + int type; } php_socket; typedef struct { - zend_bool use_system_read; + fd_set set; + SOCKET max_fd; +} php_fd_set; + +typedef struct { + unsigned char info[256]; +} php_sockaddr_storage; + +typedef struct { + zend_bool use_system_read; } php_sockets_globals; -- cgit v1.2.1