reversing another patch that slipped

diff --git a/ext/standard/file.c b/ext/standard/file.c
index 92abdaeba279c7a60734da46418d81f21d207d5b..eef2696b9208c508b41bcef52d5b4eb4c68069f3 100644 (file)
--- a/ext/standard/file.c
+++ b/ext/standard/file.c
@@ -720,7 +720,7 @@ PHP_FUNCTION(feof)
                /* we're at the eof if the file doesn't exist */
                RETURN_TRUE;
        }
-       if ((issock?(SOCK_FEOF(socketd)):feof(fp))) {
+       if ((issock?(_php3_sock_eof(socketd)):feof(fp))) {
                RETURN_TRUE;
        } else {
                RETURN_FALSE;
@@ -896,7 +896,7 @@ PHP_FUNCTION(fgetc) {
                RETURN_FALSE;
        }
        buf = emalloc(sizeof(char) * 2);
-       if (!(issock?(*buf=SOCK_FGETC(socketd)):(*buf=fgetc(fp)))) {
+       if (!(issock?(SOCK_FGETC(buf,socketd)):(*buf=fgetc(fp)))) {
                efree(buf);
                RETVAL_FALSE;
        } else {