pajoye Wed, 27 Jan 2010 10:36:03 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=294079
Log: - #50854, fix build on non windows, svn merge is useless. Bug: http://bugs.php.net/50854 (Closed) DWORD and TSRMLS_DC undefined in php.h Changed paths: U php/php-src/trunk/main/php.h Modified: php/php-src/trunk/main/php.h =================================================================== --- php/php-src/trunk/main/php.h 2010-01-27 10:08:43 UTC (rev 294078) +++ php/php-src/trunk/main/php.h 2010-01-27 10:36:03 UTC (rev 294079) @@ -305,8 +305,9 @@ /* PHPAPI void php_error(int type, const char *format, ...); */ PHPAPI void php_error_docref0(const char *docref TSRMLS_DC, int type, const char *format, ...); PHPAPI void php_error_docref1(const char *docref TSRMLS_DC, const char *param1, int type, const char *format, ...); + +PHPAPI void php_error_docref2(const char *docref TSRMLS_DC, const char *param1, const char *param2, int type, const char *format, ...); #ifdef PHP_WIN32 -PHPAPI void php_error_docref2(const char *docref TSRMLS_DC, const char *param1, const char *param2, int type, const char *format, ...); PHPAPI void php_win32_docref2_from_error(DWORD error, const char *param1, const char *param2 TSRMLS_DC); #endif END_EXTERN_C()
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
