Skip to content

Commit df16822

Browse files
committed
fixed 7.0.7.1 zend_expected_type can not init use IS_UNDEF in c++
1 parent bf4f3a1 commit df16822

File tree

2 files changed

+22
-1
lines changed

2 files changed

+22
-1
lines changed

.travis.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
language: php
22

3+
dist: xenial
4+
35
compiler:
46
- gcc
57
- clang
@@ -16,7 +18,6 @@ addons:
1618
- clickhouse
1719

1820
php:
19-
- 5.4
2021
- 5.5
2122
- 5.6
2223
- 7.0
@@ -32,6 +33,10 @@ notifications:
3233
before_install:
3334
- docker run -d -p 9000:9000 --name some-clickhouse-server --ulimit nofile=262144:262144 yandex/clickhouse-server
3435
- docker ps -a
36+
- g++ -v
37+
- gcc -v
38+
- clang -v
39+
- clang++ -v
3540

3641
#Compile
3742
before_script:

SeasClick.cpp

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -225,9 +225,13 @@ PHP_METHOD(SEASCLICK_RES_NAME, __construct)
225225
return;
226226
}
227227
#else
228+
#undef IS_UNDEF
229+
#define IS_UNDEF Z_EXPECTED_LONG
228230
ZEND_PARSE_PARAMETERS_START(1, 1)
229231
Z_PARAM_ARRAY(connectParames)
230232
ZEND_PARSE_PARAMETERS_END();
233+
#undef IS_UNDEF
234+
#define IS_UNDEF 0
231235
#endif
232236

233237
HashTable *_ht = Z_ARRVAL_P(connectParames);
@@ -338,11 +342,15 @@ PHP_METHOD(SEASCLICK_RES_NAME, select)
338342
return;
339343
}
340344
#else
345+
#undef IS_UNDEF
346+
#define IS_UNDEF Z_EXPECTED_LONG
341347
ZEND_PARSE_PARAMETERS_START(1, 2)
342348
Z_PARAM_STRING(sql, l_sql)
343349
Z_PARAM_OPTIONAL
344350
Z_PARAM_ARRAY(params)
345351
ZEND_PARSE_PARAMETERS_END();
352+
#undef IS_UNDEF
353+
#define IS_UNDEF 0
346354
#endif
347355
try {
348356
string sql_s = (string)sql;
@@ -404,11 +412,15 @@ PHP_METHOD(SEASCLICK_RES_NAME, insert)
404412
return;
405413
}
406414
#else
415+
#undef IS_UNDEF
416+
#define IS_UNDEF Z_EXPECTED_LONG
407417
ZEND_PARSE_PARAMETERS_START(3, 3)
408418
Z_PARAM_STRING(table, l_table)
409419
Z_PARAM_ARRAY(columns)
410420
Z_PARAM_ARRAY(values)
411421
ZEND_PARSE_PARAMETERS_END();
422+
#undef IS_UNDEF
423+
#define IS_UNDEF 0
412424
#endif
413425

414426
try {
@@ -489,11 +501,15 @@ PHP_METHOD(SEASCLICK_RES_NAME, execute)
489501
return;
490502
}
491503
#else
504+
#undef IS_UNDEF
505+
#define IS_UNDEF Z_EXPECTED_LONG
492506
ZEND_PARSE_PARAMETERS_START(1, 2)
493507
Z_PARAM_STRING(sql, l_sql)
494508
Z_PARAM_OPTIONAL
495509
Z_PARAM_ARRAY(params)
496510
ZEND_PARSE_PARAMETERS_END();
511+
#undef IS_UNDEF
512+
#define IS_UNDEF 0
497513
#endif
498514

499515
try {

0 commit comments

Comments
 (0)