cvs: php4 /ext/sockets sockets.c

jason Fri Aug 16 10:23:27 2002 EDT Modified files: /php4/ext/sockets sockets.c Log: Nuke warnings on strict compilers Index: php4/ext/sockets/sockets.c diff -u php4/ext/sockets/sockets.c:1.117 php4/ext/sockets/sockets.c:1.118 --- php4/ext/sockets/sockets.c:1.117 Sun Jul 7 03:01:17 2002 +++ php4/ext/sockets/sockets.c Fri Aug 16 10:23:27 2002 @@ -19,7 +19,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sockets.c,v 1.117 2002/07/07 07:01:17 jason Exp $ */ +/* $Id: sockets.c,v 1.118 2002/08/16 14:23:27 jason Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -112,7 +112,9 @@ {7, BYREF_NONE, BYREF_NONE, BYREF_FORCE, BYREF_FORCE, BYREF_FORCE, BYREF_FORCE, BYREF_FORCE}; /* Global buffer for php_strerror() */ +#if defined(PHP_WIN32) || (! defined(HAVE_HSTRERROR)) static char php_strerror_buf[10000]; +#endif /* {{{ sockets_functions[] */ @@ -1521,12 +1523,12 @@ } memset(sa, 0, sizeof(sa_storage)); - hdr.msg_name = sin; + hdr.msg_name = (void *) sin; hdr.msg_namelen = sizeof(sa_storage); hdr.msg_iov = iov->iov_array; hdr.msg_iovlen = iov->count; - hdr.msg_control = ctl_buf ? ctl_buf : NULL; + hdr.msg_control = ctl_buf ? (void *) ctl_buf : NULL; hdr.msg_controllen = ctl_buf ? Z_LVAL_P(arg4) : 0; #ifndef MISSING_MSGHDR_MSGFLAGS hdr.msg_flags = 0; @@ -1575,13 +1577,13 @@ case AF_UNIX: memset(sa, 0, sizeof(sa_storage)); - hdr.msg_name = s_un; + hdr.msg_name = (void *) s_un; hdr.msg_namelen = sizeof(struct sockaddr_un); hdr.msg_iov = iov->iov_array; hdr.msg_iovlen = iov->count; if (ctl_buf) { - hdr.msg_control = ctl_buf; + hdr.msg_control = (void *) ctl_buf; hdr.msg_controllen = Z_LVAL_P(arg4); } else { hdr.msg_control = NULL; @@ -1667,7 +1669,7 @@ set_errno(0); memset(&hdr, 0, sizeof(hdr)); - hdr.msg_name = &sa; + hdr.msg_name = (void *) &sa; hdr.msg_namelen = sizeof(sa); hdr.msg_iov = iov->iov_array; hdr.msg_iovlen = iov->count; @@ -1695,7 +1697,7 @@ set_errno(0); - hdr.msg_name = s_un; + hdr.msg_name = (void *) s_un; hdr.msg_iov = iov->iov_array; hdr.msg_iovlen = iov->count;