sniper Tue Mar 8 16:45:40 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/main php.h main.c
Log:
MFH
http://cvs.php.net/diff.php/php-src/main/php.h?r1=1.203.2.6&r2=1.203.2.7&ty=u
Index: php-src/main/php.h
diff -u php-src/main/php.h:1.203.2.6 php-src/main/php.h:1.203.2.7
--- php-src/main/php.h:1.203.2.6 Tue Mar 8 16:23:21 2005
+++ php-src/main/php.h Tue Mar 8 16:45:38 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php.h,v 1.203.2.6 2005/03/08 21:23:21 sniper Exp $ */
+/* $Id: php.h,v 1.203.2.7 2005/03/08 21:45:38 sniper Exp $ */
#ifndef PHP_H
#define PHP_H
@@ -320,7 +320,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);
@@ -328,6 +328,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.604.2.7&r2=1.604.2.8&ty=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.604.2.7 php-src/main/main.c:1.604.2.8
--- php-src/main/main.c:1.604.2.7 Sun Jan 9 11:30:15 2005
+++ php-src/main/main.c Tue Mar 8 16:45:38 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: main.c,v 1.604.2.7 2005/01/09 16:30:15 sniper Exp $ */
+/* $Id: main.c,v 1.604.2.8 2005/03/08 21:45:38 sniper Exp $ */
/* {{{ includes
*/
@@ -549,9 +549,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
