diff options
| author | Dmitry Stogov <dmitry@php.net> | 2005-11-30 10:29:44 +0000 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@php.net> | 2005-11-30 10:29:44 +0000 |
| commit | 0a5d10a5b9f38cef861f624f7195ee403cf8b422 (patch) | |
| tree | 69566cba621dabf804896846d0e2cb4ff140ede4 /Zend | |
| parent | 02aad34c43b719266b02b73d8551281f8579548b (diff) | |
| download | php-git-0a5d10a5b9f38cef861f624f7195ee403cf8b422.tar.gz | |
Fixed bug #35373 (HP-UX "alias not allowed in this configuration")
Diffstat (limited to 'Zend')
| -rw-r--r-- | Zend/zend.c | 2 | ||||
| -rw-r--r-- | Zend/zend.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend.c b/Zend/zend.c index d9504d37fa..b0150da993 100644 --- 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 fdeb1469e6..c6da330287 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) +#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 |