fix datatype mismatches

diff --git a/Zend/zend_llist.c b/Zend/zend_llist.c
index 0fb49abf5b46f1a7f776b3e15700eaf4755b0c08..0df7e702f189e574da2ed5d252933b6f3dcbdf9e 100644 (file)
--- a/Zend/zend_llist.c
+++ b/Zend/zend_llist.c
@@ -243,7 +243,7 @@ ZEND_API void zend_llist_apply_with_arguments(zend_llist *l, llist_apply_with_ar
 }
 
 
-ZEND_API int zend_llist_count(zend_llist *l)
+ZEND_API size_t zend_llist_count(zend_llist *l)
 {
        return l->count;
 }

diff --git a/Zend/zend_llist.h b/Zend/zend_llist.h
index 602884c27dafe400d678bbd21fe721568bdfd4c9..ffe0c3cf9914843b77d28799f64ec34715927a3e 100644 (file)
--- a/Zend/zend_llist.h
+++ b/Zend/zend_llist.h
@@ -59,7 +59,7 @@ ZEND_API void zend_llist_apply(zend_llist *l, llist_apply_func_t func TSRMLS_DC)
 ZEND_API void zend_llist_apply_with_del(zend_llist *l, int (*func)(void *data));
 ZEND_API void zend_llist_apply_with_argument(zend_llist *l, llist_apply_with_arg_func_t func, void *arg TSRMLS_DC);
 ZEND_API void zend_llist_apply_with_arguments(zend_llist *l, llist_apply_with_args_func_t func TSRMLS_DC, int num_args, ...);
-ZEND_API int zend_llist_count(zend_llist *l);
+ZEND_API size_t zend_llist_count(zend_llist *l);
 ZEND_API void zend_llist_sort(zend_llist *l, llist_compare_func_t comp_func TSRMLS_DC);
 
 /* traversal */

diff --git a/main/streams/streams.c b/main/streams/streams.c
index 6be2b91dc7a43391cf63491a2c39548280e5149a..e49eb1712e7f6b961ae9b6525e2c1c64ac5b52da 100644 (file)
--- a/main/streams/streams.c
+++ b/main/streams/streams.c
@@ -177,7 +177,7 @@ void php_stream_display_wrapper_errors(php_stream_wrapper *wrapper, const char *
                        size_t l = 0;
                        int brlen;
                        int i;
-                       int count = zend_llist_count(err_list);
+                       int count = (int)zend_llist_count(err_list);
                        const char *br;
                        const char **err_buf_p;
                        zend_llist_position pos;