From e81e57aadf5647511f5c27843ea565a141cf2e3d Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 29 Jan 2024 16:47:49 +0100 Subject: [PATCH] Fix incompatible pointer types --- src/php_pqlob.c | 2 +- src/php_pqres.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/php_pqlob.c b/src/php_pqlob.c index 0cb44a8..a419390 100644 --- a/src/php_pqlob.c +++ b/src/php_pqlob.c @@ -169,7 +169,7 @@ static int php_pqlob_stream_flush(php_stream *stream) return SUCCESS; } -static ZEND_RESULT_CODE php_pqlob_stream_seek(php_stream *stream, off_t offset, int whence, off_t *newoffset) +static ZEND_RESULT_CODE php_pqlob_stream_seek(php_stream *stream, zend_off_t offset, int whence, zend_off_t *newoffset) { ZEND_RESULT_CODE rv = FAILURE; php_pqlob_object_t *obj = stream->abstract; diff --git a/src/php_pqres.c b/src/php_pqres.c index e9de463..c8262ac 100644 --- a/src/php_pqres.c +++ b/src/php_pqres.c @@ -398,24 +398,24 @@ static zend_object_iterator_funcs php_pqres_iterator_funcs = { #endif }; -static inline ZEND_RESULT_CODE php_pqres_count_elements_ex(zend_object *object, long *count) +static inline ZEND_RESULT_CODE php_pqres_count_elements_ex(zend_object *object, zend_long *count) { php_pqres_object_t *obj = PHP_PQ_OBJ(NULL, object); if (!obj->intern) { return FAILURE; } else { - *count = (long) PQntuples(obj->intern->res); + *count = (zend_long) PQntuples(obj->intern->res); return SUCCESS; } } #if PHP_VERSION_ID >= 80000 -static ZEND_RESULT_CODE php_pqres_count_elements(zend_object *object, long *count) +static ZEND_RESULT_CODE php_pqres_count_elements(zend_object *object, zend_long *count) { return php_pqres_count_elements_ex(object, count); } #else -static ZEND_RESULT_CODE php_pqres_count_elements(zval *object, long *count) +static ZEND_RESULT_CODE php_pqres_count_elements(zval *object, zend_long *count) { return php_pqres_count_elements_ex(Z_OBJ_P(object), count); } -- 2.30.2