summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfoobar <sniper@php.net>2005-03-08 21:45:51 +0000
committerfoobar <sniper@php.net>2005-03-08 21:45:51 +0000
commit827f18e2001f662cd0c09ce0ba815af052a930d1 (patch)
tree9d6c578bcf8ccb1f2ac6982cc2248a72d3b38659
parent75db37c82c0204496a8e84c92d327024f3243a44 (diff)
downloadphp-git-827f18e2001f662cd0c09ce0ba815af052a930d1.tar.gz
MFH
-rw-r--r--main/main.c4
-rw-r--r--main/php.h4
2 files changed, 5 insertions, 3 deletions
diff --git a/main/main.c b/main/main.c
index e8b62669ae..456face14d 100644
--- a/main/main.c
+++ b/main/main.c
@@ -541,9 +541,9 @@ PHPAPI void php_verror(const char *docref, const char *params, int type, const c
}
/* }}} */
-/* {{{ php_error_docref */
+/* {{{ php_error_docref0 */
/* See: CODING_STANDARDS for details. */
-PHPAPI void php_error_docref(const char *docref TSRMLS_DC, int type, const char *format, ...)
+PHPAPI void php_error_docref0(const char *docref TSRMLS_DC, int type, const char *format, ...)
{
va_list args;
diff --git a/main/php.h b/main/php.h
index b854cd4f01..552251b269 100644
--- a/main/php.h
+++ b/main/php.h
@@ -299,13 +299,15 @@ PHPAPI void php_verror(const char *docref, const char *params, int type, const c
#endif
/* PHPAPI void php_error(int type, const char *format, ...); */
-PHPAPI void php_error_docref(const char *docref TSRMLS_DC, int type, const char *format, ...)
+PHPAPI void php_error_docref0(const char *docref TSRMLS_DC, int type, const char *format, ...)
PHP_ATTRIBUTE_FORMAT(printf, PHP_ATTR_FMT_OFFSET + 3, PHP_ATTR_FMT_OFFSET + 4);
PHPAPI void php_error_docref1(const char *docref TSRMLS_DC, const char *param1, int type, const char *format, ...)
PHP_ATTRIBUTE_FORMAT(printf, PHP_ATTR_FMT_OFFSET + 4, PHP_ATTR_FMT_OFFSET + 5);
PHPAPI void php_error_docref2(const char *docref TSRMLS_DC, 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);
+#define php_error_docref php_error_docref0
+
#define zenderror phperror
#define zendlex phplex