cvs: /php4/ext/standard fsock.c fsock.h
| From: | Sascha Schumann | Date: | Fri, 03 Dec 1999 14:58:02 +0000 |
| Subject: | cvs: /php4/ext/standard fsock.c fsock.h | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-7328@lists.php.net to get a copy of this message | ||
sas Fri Dec 3 09:58:02 1999 EDT
Modified files:
/php4/ext/standard fsock.c fsock.h
Log:
Use socklen_t where appropiate
Index: php4/ext/standard/fsock.c
diff -u php4/ext/standard/fsock.c:1.28 php4/ext/standard/fsock.c:1.29
--- php4/ext/standard/fsock.c:1.28 Wed Dec 1 12:21:52 1999
+++ php4/ext/standard/fsock.c Fri Dec 3 09:57:28 1999
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: fsock.c,v 1.28 1999/12/01 17:21:52 sas Exp $ */
+/* $Id: fsock.c,v 1.29 1999/12/03 14:57:28 sas Exp $ */
/* Synced with php3 revision 1.121 1999-06-18 [ssb] */
/* Synced with php3 revision 1.133 1999-07-21 [sas] */
@@ -161,7 +161,7 @@
/* {{{ connect_nonb */
PHPAPI int connect_nonb(int sockfd,
struct sockaddr *addr,
- int addrlen,
+ socklen_t addrlen,
struct timeval *timeout)
{
/* probably won't work on Win32, someone else might try it (read: fix it ;) */
@@ -174,7 +174,7 @@
int flags;
int n;
int error = 0;
- int len;
+ socklen_t len;
int ret = 0;
fd_set rset;
fd_set wset;
Index: php4/ext/standard/fsock.h
diff -u php4/ext/standard/fsock.h:1.14 php4/ext/standard/fsock.h:1.15
--- php4/ext/standard/fsock.h:1.14 Wed Dec 1 12:07:25 1999
+++ php4/ext/standard/fsock.h Fri Dec 3 09:57:29 1999
@@ -27,7 +27,7 @@
| Jim Winstead (jimw@php.net) |
+----------------------------------------------------------------------+
*/
-/* $Id: fsock.h,v 1.14 1999/12/01 17:07:25 sas Exp $ */
+/* $Id: fsock.h,v 1.15 1999/12/03 14:57:29 sas Exp $ */
/* Synced with php3 revision 1.24 1999-06-18 [ssb] */
@@ -71,7 +71,7 @@
size_t _php3_sock_set_def_chunk_size(size_t size);
int php_msock_destroy(int *data);
-PHPAPI int connect_nonb(int sockfd, struct sockaddr *addr, int addrlen, struct timeval *timeout);
+PHPAPI int connect_nonb(int sockfd, struct sockaddr *addr, socklen_t addrlen, struct timeval
*timeout);
PHP_MINIT_FUNCTION(fsock);
PHP_MSHUTDOWN_FUNCTION(fsock);