- Fixed compile warnings

diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 3543df829e03602c89176eae39da05c521dd3ad4..ca9dfe1d4200a1b28cb5edc2480862bde5af74bc 100644 (file)
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -3680,10 +3680,10 @@ static int zend_traits_copy_functions(zend_function *fn TSRMLS_DC, int num_args,
        /* apply aliases which are qualified with a class name, there should not be any ambiguity */
        if (aliases) {
                while (aliases[i]) {
-                       if (!aliases[i]->trait_method->ce || fn->common.scope == aliases[i]->trait_method->ce &&
+                       if (!aliases[i]->trait_method->ce || (fn->common.scope == aliases[i]->trait_method->ce &&
                                (zend_binary_strcasecmp(aliases[i]->trait_method->method_name,
                                  aliases[i]->trait_method->mname_len,
-                                 fn->common.function_name, fnname_len) == 0)) {
+                                 fn->common.function_name, fnname_len) == 0))) {
                                if (aliases[i]->alias) {
                                        fn_copy = *fn;
                                        zend_traits_duplicate_function(&fn_copy, estrndup(aliases[i]->alias, aliases[i]->alias_len) TSRMLS_CC);

diff --git a/ext/standard/rand.c b/ext/standard/rand.c
index eb26cc5c500c2a88fea7f4edc79f5cd9df7532de..8cd130d9698636363c2e0595872b9c5de2790bd5 100644 (file)
--- a/ext/standard/rand.c
+++ b/ext/standard/rand.c
@@ -323,7 +323,7 @@ PHP_FUNCTION(mt_rand)
        }
 
        if (max < min) {
-               php_error_docref(NULL TSRMLS_CC, E_WARNING, "max(%d) is smaller than min(%d)", max, min);
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "max(%ld) is smaller than min(%ld)", max, min);
                RETURN_FALSE;
        }