Fixed bug #30641 (Compile error: error: symbol "zend_error" is used but not defined)

diff --git a/NEWS b/NEWS
index 487b5099fa932dea0dd1952b5d2a32f8d0433108..66f17b97cfc18b14f0609b27db4ec969aee2ae92 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -123,6 +123,8 @@ PHP                                                                        NEWS
   (Rob)
 - Fixed bug #30578 (Output buffers flushed before calling __desctruct()
   functions). (Jani)
+- Fixed bug #30641 (Compile error: error: symbol "zend_error" is used but not
+  defined). (Dmitry)
 - Fixed bug #30407 (Strange behaviour of default arguments). (Dmitry)
 - Fixed bug #29728 (Reflection API Feature: Default parameter value). (Marcus)
 - Fixed bug #29522 (accessing properties without connection). (Georg)

diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index 7d8cc74261b5bc3ad696461ade5ffa22448e7cc0..178b06e51de6bfa1d14d2176177cd50fe323b7ee 100644 (file)
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@ -42,7 +42,7 @@
 #define _UNUSED_CODE 3
 #define _CV_CODE     4
 
-#if defined(__GNUC__) && !defined(__INTEL_COMPILER) && !defined(DARWIN) && !defined(ZEND_VM_OLD_EXECUTOR)
+#if defined(__GNUC__) && !defined(__INTEL_COMPILER) && !defined(DARWIN) && !defined(__sun__) && !defined(ZEND_VM_OLD_EXECUTOR)
 #  define ZEND_VM_ALWAYS_INLINE  __attribute__ ((always_inline))
 void zend_error_noreturn(int type, const char *format, ...) __attribute__ ((alias("zend_error"),noreturn));
 /*extern void zend_error_noreturn(int type, const char *format, ...) __asm__("zend_error") __attribute__ ((noreturn));*/