summaryrefslogtreecommitdiffstats
path: root/1013.patch
blob: 581ef14d0860296d9d2b15d437af0da54e42fd09 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
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;