diff options
author | Marcus Boerger <helly@php.net> | 2006-02-26 10:57:00 +0000 |
---|---|---|
committer | Marcus Boerger <helly@php.net> | 2006-02-26 10:57:00 +0000 |
commit | 5a69b290824828833e3587cb04478316cae5e39c (patch) | |
tree | f1fc508b2375533384853944679d23a42a9c806c /main | |
parent | 84fc80064bf2630f622c24ae5c43ac05d5628608 (diff) | |
download | php-git-5a69b290824828833e3587cb04478316cae5e39c.tar.gz |
- Warning fixes by Steph
Diffstat (limited to 'main')
-rw-r--r-- | main/main.c | 2 | ||||
-rw-r--r-- | main/streams/filter.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/main/main.c b/main/main.c index 3c6d469742..b6ee590a67 100644 --- a/main/main.c +++ b/main/main.c @@ -659,7 +659,7 @@ static void php_error_cb(int type, const char *error_filename, const uint error_ * be NULL if PG(last_error_message) is not NULL */ if (strcmp(PG(last_error_message), buffer) || (!PG(ignore_repeated_source) - && ((PG(last_error_lineno) != error_lineno) + && ((PG(last_error_lineno) != (int)error_lineno) || strcmp(PG(last_error_file), error_filename)))) { display = 1; } else { diff --git a/main/streams/filter.c b/main/streams/filter.c index baa6211226..f8a8523245 100644 --- a/main/streams/filter.c +++ b/main/streams/filter.c @@ -351,7 +351,7 @@ PHPAPI void _php_stream_filter_append(php_stream_filter_chain *chain, php_stream php_stream_bucket_append(brig_inp, bucket TSRMLS_CC); status = filter->fops->filter(stream, filter, brig_inp, brig_outp, &consumed, PSFS_FLAG_NORMAL TSRMLS_CC); - if (stream->readpos + consumed > stream->writepos || consumed < 0) { + if (stream->readpos + consumed > (uint)stream->writepos || consumed < 0) { /* No behaving filter should cause this. */ status = PSFS_ERR_FATAL; } |