From: foobar <sniper@php.net>
Date: Tue, 8 Mar 2005 21:45:38 +0000 (+0000)
Subject: MFH
X-Git-Tag: php-5.0.4RC1~55
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a39d2b5747d37df001f05f29f9907bbdc1a15fe8;p=php

MFH
---

diff --git a/main/main.c b/main/main.c
index 5b13943a5d..7e42c3b3af 100644
--- a/main/main.c
+++ b/main/main.c
@@ -549,9 +549,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 7106990633..0ee8d0f65b 100644
--- a/main/php.h
+++ b/main/php.h
@@ -320,7 +320,7 @@ 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);
@@ -328,6 +328,8 @@ PHPAPI void php_error_docref2(const char *docref TSRMLS_DC, const char *param1,
 	PHP_ATTRIBUTE_FORMAT(printf, PHP_ATTR_FMT_OFFSET + 5, PHP_ATTR_FMT_OFFSET + 6);
 END_EXTERN_C()
 
+#define php_error_docref php_error_docref0
+
 #define zenderror phperror
 #define zendlex phplex