Merge branch 'PHP-7.4'

laruence · laruence · commit 583c7a4cbbba · 2020-03-12T15:45:07.000+08:00
diff --git a/ext/ffi/ffi.c b/ext/ffi/ffi.c
@@ -581,6 +581,7 @@ static uint64_t zend_ffi_bit_field_read(void *ptr, zend_ffi_field *field) /* {{{
 
 	return val;
 }
+/* }}} */
 
 static void zend_ffi_bit_field_to_zval(void *ptr, zend_ffi_field *field, zval *rv) /* {{{ */
 {

Original file line number	Diff line number	Diff line change
`@@ -581,6 +581,7 @@ static uint64_t zend_ffi_bit_field_read(void ptr, zend_ffi_field field) /* {{{`
`581`	`581`
`582`	`582`	`return val;`
`583`	`583`	`}`
	`584`	`+/* }}} */`
`584`	`585`
`585`	`586`	`static void zend_ffi_bit_field_to_zval(void ptr, zend_ffi_field field, zval rv) / {{{ */`
`586`	`587`	`{`