diff options
| author | Wez Furlong <wez@php.net> | 2003-02-28 21:03:36 +0000 |
|---|---|---|
| committer | Wez Furlong <wez@php.net> | 2003-02-28 21:03:36 +0000 |
| commit | 349ce76f9660850c0a15f660dff7cebb81c0abc8 (patch) | |
| tree | cd03704ec5665e40106e5c509e3fb313c4423c50 /main/streams/xp_socket.c | |
| parent | 1ad304c2c529905c9a157afa8d3bb57f26481f7e (diff) | |
| download | php-git-349ce76f9660850c0a15f660dff7cebb81c0abc8.tar.gz | |
Tidy up stupid signed/unsigned issues with win32 by introducing a php_socket_t typedef.
Diffstat (limited to 'main/streams/xp_socket.c')
| -rw-r--r-- | main/streams/xp_socket.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/main/streams/xp_socket.c b/main/streams/xp_socket.c index c2547bd7d3..58e9e28a7c 100644 --- a/main/streams/xp_socket.c +++ b/main/streams/xp_socket.c @@ -422,7 +422,8 @@ static inline int php_tcp_sockop_connect(php_stream *stream, php_netstream_data_ php_stream_xport_param *xparam TSRMLS_DC) { char *host = NULL; - int portno, err; + int portno; + int err; int ret; #ifdef AF_UNIX @@ -441,7 +442,7 @@ static inline int php_tcp_sockop_connect(php_stream *stream, php_netstream_data_ parse_unix_address(xparam, &unix_addr TSRMLS_CC); ret = php_network_connect_socket(sock->socket, - (const struct sockaddr *)&unix_addr, sizeof(unix_addr), + (const struct sockaddr *)&unix_addr, (socklen_t)sizeof(unix_addr), xparam->op == STREAM_XPORT_OP_CONNECT_ASYNC, xparam->inputs.timeout, xparam->want_errortext ? &xparam->outputs.error_text : NULL, &err); @@ -465,7 +466,8 @@ static inline int php_tcp_sockop_connect(php_stream *stream, php_netstream_data_ sock->socket = php_network_connect_socket_to_host(host, portno, stream->ops == &php_stream_udp_socket_ops ? SOCK_DGRAM : SOCK_STREAM, xparam->op == STREAM_XPORT_OP_CONNECT_ASYNC, - xparam->inputs.timeout, xparam->want_errortext ? &xparam->outputs.error_text : NULL, + xparam->inputs.timeout, + xparam->want_errortext ? &xparam->outputs.error_text : NULL, &err TSRMLS_CC); |