MFH: fix build on Tru64

diff --git a/Zend/zend.c b/Zend/zend.c
index 88601eab4ea7c2bb07061572298500caa654a85b..7b63d9bf6ba53d529da7041e52b92b9338e8a5c4 100644 (file)
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@ -1078,7 +1078,7 @@ ZEND_API void zend_error(int type, const char *format, ...)
        }
 }
 
-#if defined(__GNUC__) && !defined(__INTEL_COMPILER) && !defined(DARWIN) && !defined(__hpux) && !defined(_AIX)
+#if defined(__GNUC__) && !defined(__INTEL_COMPILER) && !defined(DARWIN) && !defined(__hpux) && !defined(_AIX) && !defined(__osf__)
 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 9e252ca0eccebba5013a4d0c4cda0a6fbcbb102b..cfcdc1623c2303e69f1576a007e76c0e5f3e2648 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) && !defined(__hpux) && !defined(_AIX)
+#if defined(__GNUC__) && !defined(__INTEL_COMPILER) && !defined(DARWIN) && !defined(__hpux) && !defined(_AIX) && !defined(__osf__)
 #  define ZEND_VM_ALWAYS_INLINE  __attribute__ ((always_inline))
 void zend_error_noreturn(int type, const char *format, ...) __attribute__ ((noreturn));
 #else