Fix CI with nightly PHP

php-ion · Jun 9, 2018 · de2acee · de2acee
1 parent 8e664eb
commit de2acee
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/ion/ion_callback.c b/src/ion/ion_callback.c
@@ -70,7 +70,9 @@ pion_cb * pion_cb_fetch_method_ce(zend_class_entry * ce, const char * method_nam
     cb->fci->params        = NULL;
     cb->fci->no_separation = 1;
 
+#ifdef HAS_FCC_INITIALIZED
     cb->fcc->initialized      = 1;
+#endif
     cb->fcc->function_handler = fptr;
     cb->fcc->calling_scope    = NULL;
     cb->fcc->called_scope     = ce;

diff --git a/src/ion/ion_init.h b/src/ion/ion_init.h
@@ -84,13 +84,17 @@ typedef struct _ion_http_body_parser ion_http_body_parser;
 
 #if PHP_API_VERSION == 20160303
 # define IS_PHP71    1
+# define HAS_FCC_INITIALIZED 1
+
 # define ION_TYPE_CODE(arg_info) ((arg_info)->type_hint)
 # define ION_TYPE_IS_SET(arg_info) ((arg_info)->type_hint != IS_UNDEF)
 # define ION_TYPE_IS_CLASS(arg_info) ((arg_info)->class_name)
 # define ION_TYPE_NAME(arg_info) ((arg_info)->class_name)
 # define ION_TYPE_ALLOW_NULL(arg_info) ((arg_info)->allow_null)
-#else
+#elif PHP_API_VERSION == 20170718
 # define IS_PHP72    1
+# define HAS_FCC_INITIALIZED 1
+
 # define ION_TYPE_CODE(arg_info) (ZEND_TYPE_CODE((arg_info)->type))
 # define ION_TYPE_IS_SET(arg_info) ZEND_TYPE_IS_SET((arg_info)->type)
 # define ION_TYPE_IS_CLASS(arg_info) ZEND_TYPE_IS_CLASS((arg_info)->type)