On 01/27/2010 09:48 AM, Pierre Joye wrote:
pajoye Wed, 27 Jan 2010 07:48:31 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=294075
Log:
- #50854, fix build on non windows
Bug: http://bugs.php.net/50854 (Open) DWORD and TSRMLS_DC undefined in php.h
Changed paths:
U php/php-src/branches/PHP_5_3/main/php.h
U php/php-src/trunk/main/php.h
Modified: php/php-src/branches/PHP_5_3/main/php.h
===================================================================
--- php/php-src/branches/PHP_5_3/main/php.h 2010-01-27 05:00:04 UTC (rev
294074)
+++ php/php-src/branches/PHP_5_3/main/php.h 2010-01-27 07:48:31 UTC (rev
294075)
@@ -309,8 +309,9 @@
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);
+#ifdef PHP_WIN32
PHPAPI void php_win32_docref2_from_error(DWORD error, const char *param1,
const char *param2 TSRMLS_DC);
-
+#endif
END_EXTERN_C()
#define php_error_docref php_error_docref0
Modified: php/php-src/trunk/main/php.h
===================================================================
--- php/php-src/trunk/main/php.h 2010-01-27 05:00:04 UTC (rev 294074)
+++ php/php-src/trunk/main/php.h 2010-01-27 07:48:31 UTC (rev 294075)
@@ -305,8 +305,10 @@
/* 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, ...);
+#ifdef PHP_WIN32
PHPAPI void php_error_docref2(const char *docref TSRMLS_DC,
conshp_error_docref2t 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()
Are you really sure? I didn't know php_error_docref2() was also win32 only?
--Jani
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
