diff options
| author | Peter Kokot <peterkokot@gmail.com> | 2019-07-13 02:10:17 +0200 |
|---|---|---|
| committer | Peter Kokot <peterkokot@gmail.com> | 2019-07-13 02:10:17 +0200 |
| commit | e0ea444dd33ac8a089ab629abeb5501b7c29a749 (patch) | |
| tree | 47b09ae097256485618f92386e4cf13440e2b655 /main/php.h | |
| parent | 930e38ec5c742721f2f18f326954682954b379af (diff) | |
| parent | 1c1de0c41a74b4deadd11cb18f00f115db0568ec (diff) | |
| download | php-git-e0ea444dd33ac8a089ab629abeb5501b7c29a749.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Convert all php_error_docref0 to php_error_docref
Diffstat (limited to 'main/php.h')
| -rw-r--r-- | main/php.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/main/php.h b/main/php.h index 2d0a1f8ce1..c74f76f2ab 100644 --- a/main/php.h +++ b/main/php.h @@ -339,7 +339,7 @@ static inline ZEND_ATTRIBUTE_DEPRECATED void php_std_error_handling() {} PHPAPI ZEND_COLD void php_verror(const char *docref, const char *params, int type, const char *format, va_list args) PHP_ATTRIBUTE_FORMAT(printf, 4, 0); /* PHPAPI void php_error(int type, const char *format, ...); */ -PHPAPI ZEND_COLD void php_error_docref0(const char *docref, int type, const char *format, ...) +PHPAPI ZEND_COLD void php_error_docref(const char *docref, int type, const char *format, ...) PHP_ATTRIBUTE_FORMAT(printf, 3, 4); PHPAPI ZEND_COLD void php_error_docref1(const char *docref, const char *param1, int type, const char *format, ...) PHP_ATTRIBUTE_FORMAT(printf, 4, 5); @@ -350,8 +350,6 @@ PHPAPI ZEND_COLD void php_win32_docref2_from_error(DWORD error, const char *para #endif END_EXTERN_C() -#define php_error_docref php_error_docref0 - #define zenderror phperror #define zendlex phplex |