wez Mon Sep 23 11:21:17 2002 EDT
Modified files:
/php4/main streams.c
Log:
Hopefully fix the other warnings that my last warning-fixing commit caused.
Index: php4/main/streams.c
diff -u php4/main/streams.c:1.77 php4/main/streams.c:1.78
--- php4/main/streams.c:1.77 Mon Sep 23 10:50:21 2002
+++ php4/main/streams.c Mon Sep 23 11:21:16 2002
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: streams.c,v 1.77 2002/09/23 14:50:21 wez Exp $ */
+/* $Id: streams.c,v 1.78 2002/09/23 15:21:16 wez Exp $ */
#define _GNU_SOURCE
#include "php.h"
@@ -33,6 +33,8 @@
#include <sys/mman.h>
#endif
+#include <stddef.h>
+
#include <fcntl.h>
#ifndef MAP_FAILED
@@ -320,7 +322,7 @@
/* 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 @@
} 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);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
