This makes more sense. (Someone might actually use php_error_docref0() :)

diff --git a/main/main.c b/main/main.c
index b2dd27e066a3da877100f30d0cc70be78bf34e40..a114e1f8ffc9162e6bdeceece33831fd3edad170 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -545,9 +545,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 e9f87baaa0ede7b0d2d1c18d5f5f1e4ce4d5057b..6d58825b6ecb97d5934337aa16a3c8e832f2efcd 100644 (file)
--- a/main/php.h
+++ b/main/php.h
@@ -299,7 +299,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);
@@ -307,6 +307,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