cvs: php-src(PHP_4_3) /main main.c php.h

From: Date: Tue, 08 Mar 2005 21:45:51 +0000
Subject: cvs: php-src(PHP_4_3) /main main.c php.h
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-30788@lists.php.net to get a copy of this message
sniper Tue Mar 8 16:45:51 2005 EDT Modified files: (Branch: PHP_4_3) /php-src/main php.h main.c Log: MFH http://cvs.php.net/diff.php/php-src/main/php.h?r1=1.178.2.12&r2=1.178.2.13&ty=u Index: php-src/main/php.h diff -u php-src/main/php.h:1.178.2.12 php-src/main/php.h:1.178.2.13 --- php-src/main/php.h:1.178.2.12 Tue Mar 8 16:22:20 2005 +++ php-src/main/php.h Tue Mar 8 16:45:51 2005 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php.h,v 1.178.2.12 2005/03/08 21:22:20 sniper Exp $ */ +/* $Id: php.h,v 1.178.2.13 2005/03/08 21:45:51 sniper Exp $ */ #ifndef PHP_H #define PHP_H @@ -299,13 +299,15 @@ #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 http://cvs.php.net/diff.php/php-src/main/main.c?r1=1.512.2.59&r2=1.512.2.60&ty=u Index: php-src/main/main.c diff -u php-src/main/main.c:1.512.2.59 php-src/main/main.c:1.512.2.60 --- php-src/main/main.c:1.512.2.59 Wed Feb 16 23:46:52 2005 +++ php-src/main/main.c Tue Mar 8 16:45:51 2005 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: main.c,v 1.512.2.59 2005/02/17 04:46:52 iliaa Exp $ */ +/* $Id: main.c,v 1.512.2.60 2005/03/08 21:45:51 sniper Exp $ */ /* {{{ includes */ @@ -541,9 +541,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;

« previous php.cvs (#30788) next »