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

diff --git a/Zend/zend.c b/Zend/zend.c
index d9504d37fa61c88391938dada9449e382837070a..b0150da9930b16566dee81df8ceeb0c2361ade28 100644 (file)
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@ -1035,7 +1035,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 fdeb1469e692551f2442e2bfef364ac3c2d8e68f..c6da330287e89873fd80458e5e24574953a0bd50 100644 (file)
--- a/Zend/zend.h
+++ b/Zend/zend.h
@@ -250,7 +250,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)
+#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