From: Antony Dovgal Date: Thu, 26 Apr 2007 19:08:24 +0000 (+0000) Subject: fix build on Tru64 X-Git-Tag: RELEASE_1_2_0~212 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5ff229034fb9c1812ee33a890fe213cb76fb9f36;p=php fix build on Tru64 --- diff --git a/Zend/zend.c b/Zend/zend.c index f88c0dc851..51ad522751 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -1575,7 +1575,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 8d649bb2b7..63e3181934 100644 --- a/Zend/zend.h +++ b/Zend/zend.h @@ -280,7 +280,7 @@ static inline zstr _to_zstr(void *v) { #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