From: Wez Furlong <wez@php.net>
Date: Mon, 23 Sep 2002 15:21:16 +0000 (+0000)
Subject: Hopefully fix the other warnings that my last warning-fixing commit caused.
X-Git-Tag: MODERN_SYMMETRIC_SESSION_BEHAVIOUR_20021003~230
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a3cda3b32d14a6b0cff141fdbd8da1030e40cddd;p=php

Hopefully fix the other warnings that my last warning-fixing commit caused.
---

diff --git a/main/streams.c b/main/streams.c
index bcb210aa2d..8453da767e 100755
--- a/main/streams.c
+++ b/main/streams.c
@@ -33,6 +33,8 @@
 #include <sys/mman.h>
 #endif
 
+#include <stddef.h>
+
 #include <fcntl.h>
 
 #ifndef MAP_FAILED
@@ -320,7 +322,7 @@ static void php_stream_fill_read_buffer(php_stream *stream, size_t size TSRMLS_D
 	/* allocate/fill the buffer */
 	
 	/* is there enough data in the buffer ? */
-	while (stream->writepos - stream->readpos < size) {
+	while (stream->writepos - stream->readpos < (off_t)size) {
 		size_t justread;
 		
 		/* no; so lets fetch more data */
@@ -390,7 +392,7 @@ PHPAPI size_t _php_stream_read(php_stream *stream, char *buf, size_t size TSRMLS
 	} else {
 		php_stream_fill_read_buffer(stream, size TSRMLS_CC);
 
-		if (size > stream->writepos - stream->readpos)
+		if ((off_t)size > stream->writepos - stream->readpos)
 			size = stream->writepos - stream->readpos;
 
 		memcpy(buf, stream->readbuf + stream->readpos, size);