Skip to content

Commit 9f5a282

Browse files
tony2001bigbes
authored andcommitted
updated PHP7 implementation
1 parent 61b9d7b commit 9f5a282

File tree

6 files changed

+354
-382
lines changed

6 files changed

+354
-382
lines changed

config.m4

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
dnl config.m4 for extension tarantool
2-
PHP_ARG_WITH(tarantool, for tarantool support,
3-
[ --with-tarantool Enable tarantool support])
2+
PHP_ARG_ENABLE(tarantool, for tarantool support,
3+
[ --enable-tarantool Enable tarantool support])
44

55
if test "$PHP_TARANTOOL" != "no"; then
66
PHP_NEW_EXTENSION(tarantool, \

src/php_tarantool.h

+12-13
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
#include <zend_exceptions.h>
1010

1111
#include <ext/standard/info.h>
12-
1312
#if PHP_VERSION_ID >= 70000
1413
# include <ext/standard/php_smart_string.h>
1514
#else
@@ -82,19 +81,19 @@ ZEND_END_MODULE_GLOBALS(tarantool)
8281
ZEND_EXTERN_MODULE_GLOBALS(tarantool);
8382

8483
typedef struct tarantool_object {
85-
zend_object zo;
86-
char *host;
87-
int port;
88-
char *login;
89-
char *passwd;
90-
php_stream *stream;
91-
char *persistent_id;
92-
smart_string *value;
93-
struct tp *tps;
94-
char auth;
95-
char *greeting;
96-
char *salt;
84+
char *host;
85+
int port;
86+
char *login;
87+
char *passwd;
88+
php_stream *stream;
89+
char *persistent_id;
90+
smart_string *value;
91+
struct tp *tps;
92+
char auth;
93+
char *greeting;
94+
char *salt;
9795
struct tarantool_schema *schema;
96+
zend_object zo;
9897
} tarantool_object;
9998

10099
#ifdef ZTS

0 commit comments

Comments
 (0)