Fixed compilation warnings

diff --git a/Zend/zend_arena.h b/Zend/zend_arena.h
index daa976d1e3171ea93bdb1561eaab72686a4ede7a..0a1d6f11075ddbbc7f352297d478362e25dfd4ef 100644 (file)
--- a/Zend/zend_arena.h
+++ b/Zend/zend_arena.h
@@ -59,11 +59,11 @@ static zend_always_inline void* zend_arena_alloc(zend_arena **arena_ptr, size_t
 
        size = ZEND_MM_ALIGNED_SIZE(size);
 
-       if (EXPECTED(size <= (arena->end - ptr))) {
+       if (EXPECTED(size <= (size_t)(arena->end - ptr))) {
                arena->ptr = ptr + size;
        } else {
                size_t arena_size = 
-                       UNEXPECTED((size + ZEND_MM_ALIGNED_SIZE(sizeof(zend_arena))) > (arena->end - (char*) arena)) ?
+                       UNEXPECTED((size + ZEND_MM_ALIGNED_SIZE(sizeof(zend_arena))) > (size_t)(arena->end - (char*) arena)) ?
                                (size + ZEND_MM_ALIGNED_SIZE(sizeof(zend_arena))) :
                                (arena->end - (char*) arena);
                zend_arena *new_arena = (zend_arena*)emalloc(arena_size);

diff --git a/Zend/zend_execute.h b/Zend/zend_execute.h
index 717177a6986f992ff57d0a9415f6a8498dcba6cb..812d4141b41edaa465be2742898b90365155b2a2 100644 (file)
--- a/Zend/zend_execute.h
+++ b/Zend/zend_execute.h
@@ -167,8 +167,8 @@ struct _zend_vm_stack {
 #define ZEND_VM_STACK_GROW_IF_NEEDED(count)                                                            \
        do {                                                                                                                            \
                if (UNEXPECTED(((count) * ZEND_MM_ALIGNED_SIZE(sizeof(zval))) > \
-                       ((char*)EG(argument_stack)->end) -                                                      \
-                   ((char*)EG(argument_stack)->top))) {                                                \
+                       (size_t)(((char*)EG(argument_stack)->end) -                                     \
+                   ((char*)EG(argument_stack)->top)))) {                                               \
                        zend_vm_stack_extend((count) TSRMLS_CC);                                        \
                }                                                                                                                               \
        } while (0)

diff --git a/Zend/zend_string.h b/Zend/zend_string.h
index e1780d71fc48a4a2c9676899d9df5891a45ca9fe..ef0116b938d53d3cac5cc361d64ae2f2fe142b27 100644 (file)
--- a/Zend/zend_string.h
+++ b/Zend/zend_string.h
@@ -194,14 +194,14 @@ static zend_always_inline zend_string *zend_str_safe_realloc(zend_string *s, siz
 
        if (IS_INTERNED(s)) {
                ret = STR_SAFE_ALLOC(n, m, l, persistent);
-               memcpy(ret->val, s->val, ((n * m) + l > s->len ? s->len : ((n * m) + l)) + 1);
+               memcpy(ret->val, s->val, ((n * m) + l > (size_t)s->len ? (size_t)s->len : ((n * m) + l)) + 1);
        } else if (STR_REFCOUNT(s) == 1) {
                ret = (zend_string *)safe_perealloc(s, n, m, ZEND_MM_ALIGNED_SIZE(_STR_HEADER_SIZE + l + 1), persistent);
                ret->len = (n * m) + l;
                STR_FORGET_HASH_VAL(ret);
        } else {
                ret = STR_SAFE_ALLOC(n, m, l, persistent);
-               memcpy(ret->val, s->val, ((n * m) + l > s->len ? s->len : ((n * m) + l)) + 1);
+               memcpy(ret->val, s->val, ((n * m) + l > (size_t)s->len ? (size_t)s->len : ((n * m) + l)) + 1);
                STR_DELREF(s);
        }
        return ret;

diff --git a/ext/standard/php_smart_str.h b/ext/standard/php_smart_str.h
index e10a7114353be9f1929fbd586bc50ee999878674..71bcf0b22393340c13571dff692f29970968dc0d 100644 (file)
--- a/ext/standard/php_smart_str.h
+++ b/ext/standard/php_smart_str.h
@@ -132,7 +132,7 @@
  
 static inline char *smart_str_print_long(char *buf, long num) {
        char *r; 
-       _zend_print_signed_to_buf(buf, num, unsigned long, r); 
+       _zend_print_signed_to_buf(buf, num, long, r); 
        return r;
 }