sniper Tue Mar 8 16:42:11 2005 EDT
Modified files:
/php-src/main php.h main.c
Log:
This makes more sense. (Someone might actually use php_error_docref0() :)
http://cvs.php.net/diff.php/php-src/main/php.h?r1=1.213&r2=1.214&ty=u
Index: php-src/main/php.h
diff -u php-src/main/php.h:1.213 php-src/main/php.h:1.214
--- php-src/main/php.h:1.213 Tue Mar 8 16:22:03 2005
+++ php-src/main/php.h Tue Mar 8 16:42:10 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php.h,v 1.213 2005/03/08 21:22:03 sniper Exp $ */
+/* $Id: php.h,v 1.214 2005/03/08 21:42:10 sniper Exp $ */
#ifndef PHP_H
#define PHP_H
@@ -299,7 +299,7 @@
#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 @@
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
http://cvs.php.net/diff.php/php-src/main/main.c?r1=1.618&r2=1.619&ty=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.618 php-src/main/main.c:1.619
--- php-src/main/main.c:1.618 Sun Feb 27 07:50:22 2005
+++ php-src/main/main.c Tue Mar 8 16:42:10 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: main.c,v 1.618 2005/02/27 12:50:22 sniper Exp $ */
+/* $Id: main.c,v 1.619 2005/03/08 21:42:10 sniper Exp $ */
/* {{{ includes
*/
@@ -545,9 +545,9 @@
}
/* }}} */
-/* {{{ 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;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
