From: Antony Dovgal Date: Thu, 26 Apr 2007 19:08:58 +0000 (+0000) Subject: MFH: fix build on Tru64 X-Git-Tag: php-5.2.2RC2~2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3c6d2617e7f70ea804b9de943151caf53b951b88;p=php MFH: fix build on Tru64 --- diff --git a/Zend/zend.c b/Zend/zend.c index 88601eab4e..7b63d9bf6b 100644 --- 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 9e252ca0ec..cfcdc1623c 100644 --- 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