]> granicus.if.org Git - php/commitdiff
fix datatype mismatch
authorAnatol Belski <ab@php.net>
Wed, 29 Oct 2014 10:39:54 +0000 (11:39 +0100)
committerAnatol Belski <ab@php.net>
Wed, 29 Oct 2014 14:30:09 +0000 (15:30 +0100)
ext/spl/spl_heap.c

index d29150c1d6d38d290d4563616f67d67f95943620..b9f404ab113bc21a6429cabc9d619849a705fbad 100644 (file)
@@ -160,12 +160,12 @@ static int spl_ptr_heap_zval_max_cmp(zval *a, zval *b, zval *object TSRMLS_DC) {
                                /* exception or call failure */
                                return 0;
                        }
-                       return lval;
+                       return lval > 0 ? 1 : -1;
                }
        }
 
        compare_function(&result, a, b TSRMLS_CC);
-       return Z_LVAL(result);
+       return (int)Z_LVAL(result);
 }
 /* }}} */
 
@@ -184,12 +184,12 @@ static int spl_ptr_heap_zval_min_cmp(zval *a, zval *b, zval *object TSRMLS_DC) {
                                /* exception or call failure */
                                return 0;
                        }
-                       return lval;
+                       return lval > 0 ? 1 : -1;
                }
        }
 
        compare_function(&result, b, a TSRMLS_CC);
-       return Z_LVAL(result);
+       return (int)Z_LVAL(result);
 }
 /* }}} */
 
@@ -215,12 +215,12 @@ static int spl_ptr_pqueue_zval_cmp(zval *a, zval *b, zval *object TSRMLS_DC) { /
                                /* exception or call failure */
                                return 0;
                        }
-                       return lval;
+                       return lval > 0 ? 1 : -1;
                }
        }
 
        compare_function(&result, a_priority_p, b_priority_p TSRMLS_CC);
-       return Z_LVAL(result);
+       return (int)Z_LVAL(result);
 }
 /* }}} */