diff options
author | Remi Collet <remi@remirepo.net> | 2019-09-06 10:05:41 +0200 |
---|---|---|
committer | Remi Collet <remi@remirepo.net> | 2019-09-06 10:05:41 +0200 |
commit | b8da95b586a3ed881a49da3a6bacc9943947b8b7 (patch) | |
tree | f822afbf5f56b1801c965d785bb6881f1e0acf89 /1013.patch | |
parent | fd98b7a763d8b38a3a07ee7411d502ec0748f4ff (diff) |
v5.7.0preview
Diffstat (limited to '1013.patch')
-rw-r--r-- | 1013.patch | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/1013.patch b/1013.patch deleted file mode 100644 index 581ef14..0000000 --- a/1013.patch +++ /dev/null @@ -1,25 +0,0 @@ -From c0ee075892d8d38f0f47981f8e4db214a4a86d1a Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@remirepo.net> -Date: Wed, 24 Jul 2019 07:30:26 +0200 -Subject: [PATCH] fix for 7.4.0beta1 - ---- - source/shared/core_stream.cpp | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/source/shared/core_stream.cpp b/source/shared/core_stream.cpp -index d822d4a85..559498b8e 100644 ---- a/source/shared/core_stream.cpp -+++ b/source/shared/core_stream.cpp -@@ -44,7 +44,11 @@ int sqlsrv_stream_close( _Inout_ php_stream* stream, int /*close_handle*/ TSRMLS - // read from a sqlsrv stream into the buffer provided by Zend. The parameters for binary vs. char are - // set when sqlsrv_get_field is called by the user specifying which field type they want. - -+#if PHP_VERSION_ID < 70400 - size_t sqlsrv_stream_read( _Inout_ php_stream* stream, _Out_writes_bytes_(count) char* buf, _Inout_ size_t count TSRMLS_DC ) -+#else -+ssize_t sqlsrv_stream_read( _Inout_ php_stream* stream, _Out_writes_bytes_(count) char* buf, _Inout_ size_t count TSRMLS_DC ) -+#endif - { - SQLLEN read = 0; - SQLSMALLINT c_type = SQL_C_CHAR; |