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
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
|
From 953c723a59fb437fccea9aeaf4c7f69c112f6308 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Sat, 24 Jun 2017 10:59:29 +0200
Subject: [PATCH 1/2] fix for 7.2
---
.travis.yml | 2 ++
src/php_tarantool.h | 5 ++++-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/php_tarantool.h b/src/php_tarantool.h
index 1679eb7..7556671 100644
--- a/src/php_tarantool.h
+++ b/src/php_tarantool.h
@@ -17,7 +17,10 @@
# include "config.h"
#endif
-#if PHP_VERSION_ID >= 70000
+#if PHP_VERSION_ID >= 70200
+# include <Zend/zend_smart_string.h>
+# define smart_string_alloc4(d, n, what, newlen) smart_string_alloc(d, n, what)
+#elif PHP_VERSION_ID >= 70000
# include <ext/standard/php_smart_string.h>
#else
# include <ext/standard/php_smart_str.h>
From b8b1a2efdcf3ced046a5af19ea18f326bc9d7f49 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Sat, 24 Jun 2017 11:11:52 +0200
Subject: [PATCH 2/2] improve previous
---
src/php_tarantool.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/php_tarantool.h b/src/php_tarantool.h
index 7556671..bab2a49 100644
--- a/src/php_tarantool.h
+++ b/src/php_tarantool.h
@@ -19,7 +19,7 @@
#if PHP_VERSION_ID >= 70200
# include <Zend/zend_smart_string.h>
-# define smart_string_alloc4(d, n, what, newlen) smart_string_alloc(d, n, what)
+# define smart_string_alloc4(d, n, what, newlen) newlen = smart_string_alloc(d, n, what)
#elif PHP_VERSION_ID >= 70000
# include <ext/standard/php_smart_string.h>
#else
|
