Преглед изворни кода

Merge pull request #242 from stesie/fix-php7.1alpha2

Fix build against PHP 7.1.0alpha2
Stefan Siegl пре 8 година
родитељ
комит
dbd97acf20
2 измењених фајлова са 6 додато и 2 уклоњено
  1. 3 1
      v8js_array_access.cc
  2. 3 1
      v8js_object_export.cc

+ 3 - 1
v8js_array_access.cc

@@ -33,9 +33,11 @@ static zval v8js_array_access_dispatch(zend_object *object, const char *method_n
 	zval php_value;
 
 	fci.size = sizeof(fci);
+#if (PHP_MAJOR_VERSION == 7 && PHP_MINOR_VERSION == 0)
 	fci.function_table = &object->ce->function_table;
-	ZVAL_STRING(&fci.function_name, method_name);
 	fci.symbol_table = NULL;
+#endif
+	ZVAL_STRING(&fci.function_name, method_name);
 	fci.retval = &php_value;
 
 	zval params[2];

+ 3 - 1
v8js_object_export.cc

@@ -56,9 +56,11 @@ static void v8js_call_php_func(zend_object *object, zend_function *method_ptr, v
 
 	/* zend_fcall_info */
 	fci.size = sizeof(fci);
+#if (PHP_MAJOR_VERSION == 7 && PHP_MINOR_VERSION == 0)
 	fci.function_table = &object->ce->function_table;
-	fci.function_name = fname;
 	fci.symbol_table = NULL;
+#endif
+	fci.function_name = fname;
 	fci.object = object;
 	fci.retval = &retval;
 	fci.param_count = 0;