From: Sterling Hughes <sterling@php.net>
Date: Mon, 21 May 2001 18:35:47 +0000 (+0000)
Subject: one of these days I'll get this commit correct, just you watch!
X-Git-Tag: PRE_GRANULAR_GARBAGE_FIX~300
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fc741eb754e5d25cf2ddb3bf1e0d920fc0de100c;p=php

one of these days I'll get this commit correct, just you watch!

# must not commit  before coffee
# must not commit  before coffee
# *ploink*
---

diff --git a/ext/sockets/sockets.c b/ext/sockets/sockets.c
index 4aee0dfbc9..e6b36e0c84 100644
--- a/ext/sockets/sockets.c
+++ b/ext/sockets/sockets.c
@@ -641,7 +641,7 @@ PHP_FUNCTION(socket_write)
 }
 /* }}} */
 
-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 @@ PHP_FUNCTION(socket_read)
 	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 @@ PHP_FUNCTION(socket_read)
 		switch (Z_LVAL_PP(arg3)) {
 			case PHP_SYSTEM_READ:
 			case PHP_BINARY_READ:
-				read_function = (read_function) read;
+				read_function = (read_func) read;
 				break;
 		}
 	}