Fixed bug #35373 (HP-UX "alias not allowed in this configuration")

diff --git a/Zend/zend.c b/Zend/zend.c
index 7f6e3356f2d0ae94261440c6abefd159554d03d9..88eb8f3ccef77805b56380a97c2012b3fd3ea468 100644 (file)
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@ -1740,7 +1740,7 @@ ZEND_API void zend_error(int type, const char *format, ...)
        }
 }
 
-#if defined(__GNUC__) && !defined(__INTEL_COMPILER) && !defined(DARWIN)
+#if defined(__GNUC__) && !defined(__INTEL_COMPILER) && !defined(DARWIN) && !defined(__hpux)
 void zend_error_noreturn(int type, const char *format, ...) __attribute__ ((alias("zend_error"),noreturn));
 #endif
 

diff --git a/Zend/zend.h b/Zend/zend.h
index fb954ed6183b33f2f05526c6e270dfe4dbf54aa5..9c14ca0beca02b45ab329a730a89e930deb1e1b7 100644 (file)
--- a/Zend/zend.h
+++ b/Zend/zend.h
@@ -255,15 +255,7 @@ char *alloca ();
 #define INTERNAL_FUNCTION_PARAMETERS int ht, zval *return_value, zval **return_value_ptr, zval *this_ptr, int return_value_used TSRMLS_DC
 #define INTERNAL_FUNCTION_PARAM_PASSTHRU ht, return_value, return_value_ptr, this_ptr, return_value_used TSRMLS_CC
 
-#if defined(__GNUC__) && !defined(__INTEL_COMPILER) && !defined(DARWIN)
-#  define ZEND_VM_ALWAYS_INLINE  __attribute__ ((always_inline))
-void zend_error_noreturn(int type, const char *format, ...) __attribute__ ((noreturn));
-#else
-#  define ZEND_VM_ALWAYS_INLINE
-#  define zend_error_noreturn zend_error
-#endif
-
-#if defined(__GNUC__) && !defined(__INTEL_COMPILER) && !defined(DARWIN)
+#if defined(__GNUC__) && !defined(__INTEL_COMPILER) && !defined(DARWIN) && !defined(__hpux)
 #  define ZEND_VM_ALWAYS_INLINE  __attribute__ ((always_inline))
 void zend_error_noreturn(int type, const char *format, ...) __attribute__ ((noreturn));
 #else