diff options
| author | Nikita Popov <nikic@php.net> | 2016-02-14 14:47:42 +0100 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2016-02-14 14:47:42 +0100 |
| commit | 2d605e5f2448e0bc7141ca5d5cb27cb4d9f99aa9 (patch) | |
| tree | d8919bc530f566039496bb3638209ff3390eaeb4 /main/php.h | |
| parent | be607e724c69c92f8cda72a45a13a26e7c439aec (diff) | |
| parent | c9357f82d3882eb3c7cb9f63dbc98d354fb20739 (diff) | |
| download | php-git-2d605e5f2448e0bc7141ca5d5cb27cb4d9f99aa9.tar.gz | |
Merge branch 'PHP-7.0'
Diffstat (limited to 'main/php.h')
| -rw-r--r-- | main/php.h | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/main/php.h b/main/php.h index cbe6c45adb..d0ec07c82e 100644 --- a/main/php.h +++ b/main/php.h @@ -297,19 +297,13 @@ 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); -#ifdef ZTS -#define PHP_ATTR_FMT_OFFSET 1 -#else -#define PHP_ATTR_FMT_OFFSET 0 -#endif - /* PHPAPI void php_error(int type, const char *format, ...); */ PHPAPI ZEND_COLD void php_error_docref0(const char *docref, int type, const char *format, ...) - PHP_ATTRIBUTE_FORMAT(printf, PHP_ATTR_FMT_OFFSET + 3, PHP_ATTR_FMT_OFFSET + 4); + 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, PHP_ATTR_FMT_OFFSET + 4, PHP_ATTR_FMT_OFFSET + 5); + PHP_ATTRIBUTE_FORMAT(printf, 4, 5); PHPAPI ZEND_COLD void php_error_docref2(const char *docref, const char *param1, const char *param2, int type, const char *format, ...) - PHP_ATTRIBUTE_FORMAT(printf, PHP_ATTR_FMT_OFFSET + 5, PHP_ATTR_FMT_OFFSET + 6); + PHP_ATTRIBUTE_FORMAT(printf, 5, 6); #ifdef PHP_WIN32 PHPAPI ZEND_COLD void php_win32_docref2_from_error(DWORD error, const char *param1, const char *param2); #endif |