projects
/
m6w6
/
ext-pq
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge pull request #40 from m6w6/issue-php81
[m6w6/ext-pq]
/
src
/
php_pqlob.c
diff --git
a/src/php_pqlob.c
b/src/php_pqlob.c
index f183337c361de0cf04fad89eb61f6f86f615368e..0cb44a896875669ca4b4f5e42359117252b9a7a8 100644
(file)
--- a/
src/php_pqlob.c
+++ b/
src/php_pqlob.c
@@
-100,7
+100,11
@@
static void php_pqlob_object_read_stream(void *o, zval *return_value)
RETVAL_ZVAL(&zstream, 1, 0);
}
RETVAL_ZVAL(&zstream, 1, 0);
}
+#if PHP_VERSION_ID < 70400
+static size_t php_pqlob_stream_write(php_stream *stream, const char *buffer, size_t length)
+#else
static ssize_t php_pqlob_stream_write(php_stream *stream, const char *buffer, size_t length)
static ssize_t php_pqlob_stream_write(php_stream *stream, const char *buffer, size_t length)
+#endif
{
php_pqlob_object_t *obj = stream->abstract;
ssize_t written = 0;
{
php_pqlob_object_t *obj = stream->abstract;
ssize_t written = 0;
@@
-115,10
+119,18
@@
static ssize_t php_pqlob_stream_write(php_stream *stream, const char *buffer, si
php_pqconn_notify_listeners(obj->intern->txn->intern->conn);
}
php_pqconn_notify_listeners(obj->intern->txn->intern->conn);
}
+#if PHP_VERSION_ID < 70400
+ return (written < 0 ? 0 : written);
+#else
return written;
return written;
+#endif
}
}
+#if PHP_VERSION_ID < 70400
+static size_t php_pqlob_stream_read(php_stream *stream, char *buffer, size_t length)
+#else
static ssize_t php_pqlob_stream_read(php_stream *stream, char *buffer, size_t length)
static ssize_t php_pqlob_stream_read(php_stream *stream, char *buffer, size_t length)
+#endif
{
php_pqlob_object_t *obj = stream->abstract;
ssize_t read = 0;
{
php_pqlob_object_t *obj = stream->abstract;
ssize_t read = 0;
@@
-140,7
+152,11
@@
static ssize_t php_pqlob_stream_read(php_stream *stream, char *buffer, size_t le
php_pqconn_notify_listeners(obj->intern->txn->intern->conn);
}
php_pqconn_notify_listeners(obj->intern->txn->intern->conn);
}
+#if PHP_VERSION_ID < 70400
+ return (read < 0 ? 0 : read);
+#else
return read;
return read;
+#endif
}
static ZEND_RESULT_CODE php_pqlob_stream_close(php_stream *stream, int close_handle)
}
static ZEND_RESULT_CODE php_pqlob_stream_close(php_stream *stream, int close_handle)
@@
-202,10
+218,10
@@
static void php_pqlob_object_update_stream(php_pqlob_object_t *obj, zval *zstrea
php_stream_to_zval(obj->intern->stream, zstream);
#if PHP_VERSION_ID >= 80000
php_stream_to_zval(obj->intern->stream, zstream);
#if PHP_VERSION_ID >= 80000
- zend_
get_std_object_handlers()->
write_property(&obj->zo, Z_STR(zmember), zstream, NULL);
+ zend_
std_
write_property(&obj->zo, Z_STR(zmember), zstream, NULL);
#else
ZVAL_OBJ(&zobj, &obj->zo);
#else
ZVAL_OBJ(&zobj, &obj->zo);
- zend_
get_std_object_handlers()->
write_property(&zobj, &zmember, zstream, NULL);
+ zend_
std_
write_property(&zobj, &zmember, zstream, NULL);
#endif
zval_ptr_dtor(&zmember);
}
#endif
zval_ptr_dtor(&zmember);
}