diff options
| author | Anthony Ferrara <ircmaxell@gmail.com> | 2015-03-18 15:42:49 -0400 |
|---|---|---|
| committer | Anthony Ferrara <ircmaxell@gmail.com> | 2015-03-18 15:42:49 -0400 |
| commit | 8be4266f6a8e811a11c9328bd30ca0ea34603c78 (patch) | |
| tree | 08e9a02eb9937fd65fc3902186c178f10d68c75d /Zend/zend_API.h | |
| parent | 0529eeb4a6d9b826075d267d98c7bbee2ffd75ab (diff) | |
| download | php-git-8be4266f6a8e811a11c9328bd30ca0ea34603c78.tar.gz | |
Clean up API renames for zend_wrong_param_count to maintain BC, introducing a zend_wrong_param_count_ex() function when you know strict value
Diffstat (limited to 'Zend/zend_API.h')
| -rw-r--r-- | Zend/zend_API.h | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/Zend/zend_API.h b/Zend/zend_API.h index 28943ab4b5..8a704279b7 100644 --- a/Zend/zend_API.h +++ b/Zend/zend_API.h @@ -296,7 +296,8 @@ ZEND_API int zend_register_class_alias_ex(const char *name, size_t name_len, zen ZEND_API int zend_disable_function(char *function_name, size_t function_name_length); ZEND_API int zend_disable_class(char *class_name, size_t class_name_length); -ZEND_API void _zend_wrong_param_count(zend_bool strict); +ZEND_API void zend_wrong_param_count(void); +ZEND_API void zend_wrong_param_count_ex(zend_bool strict); #define IS_CALLABLE_CHECK_SYNTAX_ONLY (1<<0) #define IS_CALLABLE_CHECK_NO_ACCESS (1<<1) @@ -354,15 +355,12 @@ ZEND_API char *zend_get_type_by_const(int type); #define getThis() (Z_OBJ(EX(This)) ? &EX(This) : NULL) #define ZEND_IS_METHOD_CALL() (EX(func)->common.scope != NULL) -#define WRONG_PARAM_COUNT _ZEND_WRONG_PARAM_COUNT((ZEND_CALL_INFO(EG(current_execute_data)) & ZEND_CALL_STRICT_TYPEHINTS) ? 1 : 0) -#define WRONG_PARAM_COUNT_WITH_RETVAL(ret) _ZEND_WRONG_PARAM_COUNT_WITH_RETVAL((ZEND_CALL_INFO(EG(current_execute_data)) & ZEND_CALL_STRICT_TYPEHINTS) ? 1 : 0, ret) +#define WRONG_PARAM_COUNT ZEND_WRONG_PARAM_COUNT() +#define WRONG_PARAM_COUNT_WITH_RETVAL(ret) ZEND_WRONG_PARAM_COUNT_WITH_RETVAL() #define ARG_COUNT(dummy) EX_NUM_ARGS() #define ZEND_NUM_ARGS() EX_NUM_ARGS() -/* These are prefixed with underscores for a reason: don't use them directly - * Use WRONG_PARAM_COUNT; - */ -#define _ZEND_WRONG_PARAM_COUNT(strict) { _zend_wrong_param_count(strict); return; } -#define _ZEND_WRONG_PARAM_COUNT_WITH_RETVAL(strict, ret) { _zend_wrong_param_count(strict); return ret; } +#define ZEND_WRONG_PARAM_COUNT() { zend_wrong_param_count(); return; } +#define ZEND_WRONG_PARAM_COUNT_WITH_RETVAL(ret) { zend_wrong_param_count(); return ret; } #ifndef ZEND_WIN32 #define DLEXPORT |