Merge branch 'PHP-7.3'

remicollet · remicollet · commit dbef28ea8f02 · 2018-11-05T17:06:49.000+01:00
* PHP-7.3:
  NEWS
  Fix: #77110 undefined symbol zend_string_equal_val in C++ build
diff --git a/Zend/zend_string.h b/Zend/zend_string.h
@@ -294,7 +294,9 @@ static zend_always_inline void zend_string_release_ex(zend_string *s, int persis
 }
 
 #if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
+BEGIN_EXTERN_C()
 ZEND_API zend_bool ZEND_FASTCALL zend_string_equal_val(zend_string *s1, zend_string *s2);
+END_EXTERN_C()
 #else
 static zend_always_inline zend_bool zend_string_equal_val(zend_string *s1, zend_string *s2)
 {

Original file line number	Diff line number	Diff line change
`@@ -294,7 +294,9 @@ static zend_always_inline void zend_string_release_ex(zend_string *s, int persis`
`294`	`294`	`}`
`295`	`295`
`296`	`296`	`#if defined(__GNUC__) && (defined(__i386__) \|\| defined(__x86_64__))`
	`297`	`+BEGIN_EXTERN_C()`
`297`	`298`	`ZEND_API zend_bool ZEND_FASTCALL zend_string_equal_val(zend_string s1, zend_string s2);`
	`299`	`+END_EXTERN_C()`
`298`	`300`	`#else`
`299`	`301`	`static zend_always_inline zend_bool zend_string_equal_val(zend_string s1, zend_string s2)`
`300`	`302`	`{`