Skip to content

Commit dbd97ac

Browse files
authored
Merge pull request #242 from stesie/fix-php7.1alpha2
Fix build against PHP 7.1.0alpha2
2 parents 880b17a + 93119f1 commit dbd97ac

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

v8js_array_access.cc

+3-1
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,11 @@ static zval v8js_array_access_dispatch(zend_object *object, const char *method_n
3333
zval php_value;
3434

3535
fci.size = sizeof(fci);
36+
#if (PHP_MAJOR_VERSION == 7 && PHP_MINOR_VERSION == 0)
3637
fci.function_table = &object->ce->function_table;
37-
ZVAL_STRING(&fci.function_name, method_name);
3838
fci.symbol_table = NULL;
39+
#endif
40+
ZVAL_STRING(&fci.function_name, method_name);
3941
fci.retval = &php_value;
4042

4143
zval params[2];

v8js_object_export.cc

+3-1
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,11 @@ static void v8js_call_php_func(zend_object *object, zend_function *method_ptr, v
5656

5757
/* zend_fcall_info */
5858
fci.size = sizeof(fci);
59+
#if (PHP_MAJOR_VERSION == 7 && PHP_MINOR_VERSION == 0)
5960
fci.function_table = &object->ce->function_table;
60-
fci.function_name = fname;
6161
fci.symbol_table = NULL;
62+
#endif
63+
fci.function_name = fname;
6264
fci.object = object;
6365
fci.retval = &retval;
6466
fci.param_count = 0;

0 commit comments

Comments
 (0)