Fix incompatible pointer error for Zend object handlers.

Author: Girgias

Zend/zend_compile.h

@@ -751,8 +751,8 @@ const char *zend_get_zendtext(void);
 int zend_get_zendleng(void);
 #endif
 
-typedef int (ZEND_FASTCALL *unary_op_type)(zval *, zval *);
-typedef int (ZEND_FASTCALL *binary_op_type)(zval *, zval *, zval *);
+typedef ZEND_RESULT_CODE (ZEND_FASTCALL *unary_op_type)(zval *, zval *);
+typedef ZEND_RESULT_CODE (ZEND_FASTCALL *binary_op_type)(zval *, zval *, zval *);
 
 ZEND_API unary_op_type get_unary_op(int opcode);
 ZEND_API binary_op_type get_binary_op(int opcode);

Zend/zend_exceptions.c

@@ -1,4 +1,4 @@
-/*
+	/*
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
@@ -50,7 +50,7 @@ ZEND_API void (*zend_throw_exception_hook)(zend_object *ex);
 static zend_object_handlers default_exception_handlers;
 
 /* {{{ zend_implement_throwable */
-static ZEND_RESULT_CODE zend_implement_throwable(zend_class_entry *interface, zend_class_entry *class_type)
+static int zend_implement_throwable(zend_class_entry *interface, zend_class_entry *class_type)
 {
 	if (instanceof_function(class_type, zend_ce_exception) || instanceof_function(class_type, zend_ce_error)) {
 		return SUCCESS;

Zend/zend_generators.c

@@ -1027,7 +1027,7 @@ static void zend_generator_iterator_dtor(zend_object_iterator *iterator) /* {{{
 }
 /* }}} */
 
-static ZEND_RESULT_CODE zend_generator_iterator_valid(zend_object_iterator *iterator) /* {{{ */
+static int zend_generator_iterator_valid(zend_object_iterator *iterator) /* {{{ */
 {
 	zend_generator *generator = (zend_generator*)Z_OBJ(iterator->data);
 

Zend/zend_interfaces.c

@@ -118,7 +118,7 @@ static void zend_user_it_dtor(zend_object_iterator *_iter)
 /* }}} */
 
 /* {{{ zend_user_it_valid */
-ZEND_API ZEND_RESULT_CODE zend_user_it_valid(zend_object_iterator *_iter)
+ZEND_API int zend_user_it_valid(zend_object_iterator *_iter)
 {
 	if (_iter) {
 		zend_user_iterator *iter = (zend_user_iterator*)_iter;
@@ -251,7 +251,7 @@ ZEND_API zend_object_iterator *zend_user_it_get_new_iterator(zend_class_entry *c
 /* }}} */
 
 /* {{{ zend_implement_traversable */
-static ZEND_RESULT_CODE zend_implement_traversable(zend_class_entry *interface, zend_class_entry *class_type)
+static int zend_implement_traversable(zend_class_entry *interface, zend_class_entry *class_type)
 {
 	/* Abstract class can implement Traversable only, in which case the extending class must
 	 * implement Iterator or IteratorAggregate. */
@@ -278,7 +278,7 @@ static ZEND_RESULT_CODE zend_implement_traversable(zend_class_entry *interface,
 /* }}} */
 
 /* {{{ zend_implement_aggregate */
-static ZEND_RESULT_CODE zend_implement_aggregate(zend_class_entry *interface, zend_class_entry *class_type)
+static int zend_implement_aggregate(zend_class_entry *interface, zend_class_entry *class_type)
 {
 	if (zend_class_implements_interface(class_type, zend_ce_iterator)) {
 		zend_error_noreturn(E_ERROR,
@@ -318,7 +318,7 @@ static ZEND_RESULT_CODE zend_implement_aggregate(zend_class_entry *interface, ze
 /* }}} */
 
 /* {{{ zend_implement_iterator */
-static ZEND_RESULT_CODE zend_implement_iterator(zend_class_entry *interface, zend_class_entry *class_type)
+static int zend_implement_iterator(zend_class_entry *interface, zend_class_entry *class_type)
 {
 	if (zend_class_implements_interface(class_type, zend_ce_aggregate)) {
 		zend_error_noreturn(E_ERROR,
@@ -354,7 +354,7 @@ static ZEND_RESULT_CODE zend_implement_iterator(zend_class_entry *interface, zen
 /* }}} */
 
 /* {{{ zend_user_serialize */
-ZEND_API ZEND_RESULT_CODE zend_user_serialize(zval *object, unsigned char **buffer, size_t *buf_len, zend_serialize_data *data)
+ZEND_API int zend_user_serialize(zval *object, unsigned char **buffer, size_t *buf_len, zend_serialize_data *data)
 {
 	zend_class_entry * ce = Z_OBJCE_P(object);
 	zval retval;
@@ -391,7 +391,7 @@ ZEND_API ZEND_RESULT_CODE zend_user_serialize(zval *object, unsigned char **buff
 /* }}} */
 
 /* {{{ zend_user_unserialize */
-ZEND_API ZEND_RESULT_CODE zend_user_unserialize(zval *object, zend_class_entry *ce, const unsigned char *buf, size_t buf_len, zend_unserialize_data *data)
+ZEND_API int zend_user_unserialize(zval *object, zend_class_entry *ce, const unsigned char *buf, size_t buf_len, zend_unserialize_data *data)
 {
 	zval zdata;
 
@@ -412,23 +412,23 @@ ZEND_API ZEND_RESULT_CODE zend_user_unserialize(zval *object, zend_class_entry *
 }
 /* }}} */
 
-ZEND_API ZEND_RESULT_CODE zend_class_serialize_deny(zval *object, unsigned char **buffer, size_t *buf_len, zend_serialize_data *data) /* {{{ */
+ZEND_API int zend_class_serialize_deny(zval *object, unsigned char **buffer, size_t *buf_len, zend_serialize_data *data) /* {{{ */
 {
 	zend_class_entry *ce = Z_OBJCE_P(object);
 	zend_throw_exception_ex(NULL, 0, "Serialization of '%s' is not allowed", ZSTR_VAL(ce->name));
 	return FAILURE;
 }
 /* }}} */
 
-ZEND_API ZEND_RESULT_CODE zend_class_unserialize_deny(zval *object, zend_class_entry *ce, const unsigned char *buf, size_t buf_len, zend_unserialize_data *data) /* {{{ */
+ZEND_API int zend_class_unserialize_deny(zval *object, zend_class_entry *ce, const unsigned char *buf, size_t buf_len, zend_unserialize_data *data) /* {{{ */
 {
 	zend_throw_exception_ex(NULL, 0, "Unserialization of '%s' is not allowed", ZSTR_VAL(ce->name));
 	return FAILURE;
 }
 /* }}} */
 
 /* {{{ zend_implement_serializable */
-static ZEND_RESULT_CODE zend_implement_serializable(zend_class_entry *interface, zend_class_entry *class_type)
+static int zend_implement_serializable(zend_class_entry *interface, zend_class_entry *class_type)
 {
 	if (class_type->parent
 		&& (class_type->parent->serialize || class_type->parent->unserialize)

Zend/zend_interfaces.h

@@ -72,11 +72,11 @@ ZEND_API zend_object_iterator *zend_user_it_get_new_iterator(zend_class_entry *c
 
 ZEND_API void zend_register_interfaces(void);
 
-ZEND_API ZEND_RESULT_CODE zend_user_serialize(zval *object, unsigned char **buffer, size_t *buf_len, zend_serialize_data *data);
-ZEND_API ZEND_RESULT_CODE zend_user_unserialize(zval *object, zend_class_entry *ce, const unsigned char *buf, size_t buf_len, zend_unserialize_data *data);
+ZEND_API int zend_user_serialize(zval *object, unsigned char **buffer, size_t *buf_len, zend_serialize_data *data);
+ZEND_API int zend_user_unserialize(zval *object, zend_class_entry *ce, const unsigned char *buf, size_t buf_len, zend_unserialize_data *data);
 
-ZEND_API ZEND_RESULT_CODE zend_class_serialize_deny(zval *object, unsigned char **buffer, size_t *buf_len, zend_serialize_data *data);
-ZEND_API ZEND_RESULT_CODE zend_class_unserialize_deny(zval *object, zend_class_entry *ce, const unsigned char *buf, size_t buf_len, zend_unserialize_data *data);
+ZEND_API int zend_class_serialize_deny(zval *object, unsigned char **buffer, size_t *buf_len, zend_serialize_data *data);
+ZEND_API int zend_class_unserialize_deny(zval *object, zend_class_entry *ce, const unsigned char *buf, size_t buf_len, zend_unserialize_data *data);
 
 ZEND_API ZEND_RESULT_CODE zend_create_internal_iterator_zval(zval *return_value, zval *obj);
 

Zend/zend_weakrefs.c

@@ -372,7 +372,7 @@ static void zend_weakmap_unset_dimension(zend_object *object, zval *offset)
 	zend_weakref_unregister(obj_key, ZEND_WEAKREF_ENCODE(wm, ZEND_WEAKREF_TAG_MAP));
 }
 
-static ZEND_RESULT_CODE zend_weakmap_count_elements(zend_object *object, zend_long *count)
+static int zend_weakmap_count_elements(zend_object *object, zend_long *count)
 {
 	zend_weakmap *wm = zend_weakmap_from(object);
 	*count = zend_hash_num_elements(&wm->ht);