cvs: php4 /ext/sockets sockets.c

sterling Mon May 21 11:35:47 2001 EDT Modified files: /php4/ext/sockets sockets.c Log: one of these days I'll get this commit correct, just you watch! # must not commit before coffee # must not commit before coffee # *ploink* Index: php4/ext/sockets/sockets.c diff -u php4/ext/sockets/sockets.c:1.40 php4/ext/sockets/sockets.c:1.41 --- php4/ext/sockets/sockets.c:1.40 Mon May 21 11:07:17 2001 +++ php4/ext/sockets/sockets.c Mon May 21 11:35:47 2001 @@ -19,7 +19,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sockets.c,v 1.40 2001/05/21 18:07:17 sterling Exp $ */ +/* $Id: sockets.c,v 1.41 2001/05/21 18:35:47 sterling Exp $ */ #include "php.h" @@ -641,7 +641,7 @@ } /* }}} */ -typedef int (*read_function)(int, void *, int); +typedef int (*read_func)(int, void *, int); /* {{{ proto mixed socket_read(resource socket, int length [, int type]) Reads length bytes from socket */ @@ -650,7 +650,7 @@ zval **arg1, **arg2, **arg3; char *tmpbuf; php_socket *php_sock; - read_function = php_read; + read_func read_function = php_read; int retval, argc = ZEND_NUM_ARGS(); if (argc < 2 || argc > 3 || zend_get_parameters_ex(argc, &arg1, &arg2, &arg3) == FAILURE) { @@ -665,7 +665,7 @@ switch (Z_LVAL_PP(arg3)) { case PHP_SYSTEM_READ: case PHP_BINARY_READ: - read_function = (read_function) read; + read_function = (read_func) read; break; } }