diff options
| author | Li-Wen Hsu <lwhsu@lwhsu.org> | 2017-12-14 03:19:43 +0800 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2017-12-15 21:56:08 +0100 |
| commit | 72ec23d8233ac9a2071f991752cff55febb167d5 (patch) | |
| tree | 539e3c5d26da92237cfb3f9eaff3b94eb46a1ab2 | |
| parent | 6b1a1771b480d146ae61fa33dff359068146e091 (diff) | |
| download | php-git-72ec23d8233ac9a2071f991752cff55febb167d5.tar.gz | |
Fix bug #75677: Drop fastcall attribute on variadic function
Fastcall generally doesn't make sense on variadic functions. For
clang in particular this eliminates a "fastcall calling convention
ignored on variadic function" warning.
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | Zend/zend_hash.c | 2 | ||||
| -rw-r--r-- | Zend/zend_hash.h | 2 |
3 files changed, 4 insertions, 2 deletions
@@ -23,6 +23,8 @@ PHP NEWS properties). (pmmaga) . Fixed bug #63911 (identical trait methods raise errors during composition). (pmmaga) + . Fixed bug #75677 (Clang ignores fastcall calling convention on variadic + function). (Li-Wen Hsu) - BCMath: . Fixed bug #66364 (BCMath bcmul ignores scale parameter). (cmb) diff --git a/Zend/zend_hash.c b/Zend/zend_hash.c index ec2141eec4..29be2ca186 100644 --- a/Zend/zend_hash.c +++ b/Zend/zend_hash.c @@ -1615,7 +1615,7 @@ ZEND_API void ZEND_FASTCALL zend_hash_apply_with_argument(HashTable *ht, apply_f } -ZEND_API void ZEND_FASTCALL zend_hash_apply_with_arguments(HashTable *ht, apply_func_args_t apply_func, int num_args, ...) +ZEND_API void zend_hash_apply_with_arguments(HashTable *ht, apply_func_args_t apply_func, int num_args, ...) { uint32_t idx; Bucket *p; diff --git a/Zend/zend_hash.h b/Zend/zend_hash.h index 852ec1c56a..6a37e8a82b 100644 --- a/Zend/zend_hash.h +++ b/Zend/zend_hash.h @@ -154,7 +154,7 @@ ZEND_API void ZEND_FASTCALL zend_hash_graceful_destroy(HashTable *ht); ZEND_API void ZEND_FASTCALL zend_hash_graceful_reverse_destroy(HashTable *ht); ZEND_API void ZEND_FASTCALL zend_hash_apply(HashTable *ht, apply_func_t apply_func); ZEND_API void ZEND_FASTCALL zend_hash_apply_with_argument(HashTable *ht, apply_func_arg_t apply_func, void *); -ZEND_API void ZEND_FASTCALL zend_hash_apply_with_arguments(HashTable *ht, apply_func_args_t apply_func, int, ...); +ZEND_API void zend_hash_apply_with_arguments(HashTable *ht, apply_func_args_t apply_func, int, ...); /* This function should be used with special care (in other words, * it should usually not be used). When used with the ZEND_HASH_APPLY_STOP |