]> granicus.if.org Git - php/commitdiff
Add a couple of casts
authorSascha Schumann <sas@php.net>
Thu, 8 Jun 2000 06:07:38 +0000 (06:07 +0000)
committerSascha Schumann <sas@php.net>
Thu, 8 Jun 2000 06:07:38 +0000 (06:07 +0000)
Zend/zend_execute_API.c
Zend/zend_operators.c

index 8b1cb6f3e0ccc3f5c90af13bbf220ccf2f6c0b16..a8f5b583042d40cd446520038280be7cf7e6b12e 100644 (file)
@@ -309,7 +309,7 @@ ZEND_API int zend_is_true(zval *op)
 ZEND_API int zval_update_constant(zval **pp, void *arg)
 {
        zval *p = *pp;
-       zend_bool inline_change = (zend_bool) arg;
+       zend_bool inline_change = (zend_bool) (unsigned long) arg;
 
        if (p->type == IS_CONSTANT) {
                zval c;
index e9f9e91e8f928c99927e1e2de4f19fb1028378d3..30d7e3747e602593647b65d1a0d340e2c5b8797a 100644 (file)
@@ -1156,7 +1156,7 @@ ZEND_API int is_identical_function(zval *result, zval *op1, zval *op2)
                        }
                        break;
                case IS_ARRAY:
-                       if (zend_hash_compare(op1->value.ht, op2->value.ht, hash_zval_identical_function, 1)==0) {
+                       if (zend_hash_compare(op1->value.ht, op2->value.ht, (compare_func_t) hash_zval_identical_function, 1)==0) {
                                result->value.lval = 1;
                        } else {
                                result->value.lval = 0;
@@ -1166,7 +1166,7 @@ ZEND_API int is_identical_function(zval *result, zval *op1, zval *op2)
                        if (op1->value.obj.ce != op2->value.obj.ce) {
                                result->value.lval = 0;
                        } else {
-                               if (zend_hash_compare(op1->value.obj.properties, op2->value.obj.properties, hash_zval_identical_function, 1)==0) {
+                               if (zend_hash_compare(op1->value.obj.properties, op2->value.obj.properties, (compare_func_t) hash_zval_identical_function, 1)==0) {
                                        result->value.lval = 1;
                                } else {
                                        result->value.lval = 0;
@@ -1549,7 +1549,7 @@ static int hash_zval_compare_function(const zval **z1, const zval **z2)
 ZEND_API void zend_compare_symbol_tables(zval *result, HashTable *ht1, HashTable *ht2)
 {
        result->type = IS_LONG;
-       result->value.lval = zend_hash_compare(ht1, ht2, hash_zval_compare_function, 0);
+       result->value.lval = zend_hash_compare(ht1, ht2, (compare_func_t) hash_zval_compare_function, 0);
 }