com php-src: fix datatype mismatch: ext/spl/spl_heap.c
| From: | Anatol Belski | Date: | Wed, 29 Oct 2014 14:30:09 +0000 |
| Subject: | com php-src: fix datatype mismatch: ext/spl/spl_heap.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-82849@lists.php.net to get a copy of this message | ||
Commit: 3a6db1e77a166914f4693bab274d1dbfecb5231b
Author: Anatol Belski <ab@php.net> Wed, 29 Oct 2014 11:39:54 +0100
Parents: e888f3e4de511faf65924eba7ac92bb9d02f32b5
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=3a6db1e77a166914f4693bab274d1dbfecb5231b
Log:
fix datatype mismatch
Changed paths:
M ext/spl/spl_heap.c
Diff:
diff --git a/ext/spl/spl_heap.c b/ext/spl/spl_heap.c
index d29150c..b9f404a 100644
--- a/ext/spl/spl_heap.c
+++ b/ext/spl/spl_heap.c
@@ -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);
}
/* }}} */