andrey Mon, 16 Aug 2010 09:44:13 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=302331
Advertising
Log: Sync with trunk, fixes build failure on MacOSX. Fix for Bug #52417 MySQLi build failure with mysqlnd Bug: http://bugs.php.net/52417 (Assigned) MySQLi build failure with mysqlnd Changed paths: U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_portability.h Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h =================================================================== --- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h 2010-08-16 09:34:11 UTC (rev 302330) +++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h 2010-08-16 09:44:13 UTC (rev 302331) @@ -286,7 +286,7 @@ long debug_realloc_fail_threshold; ZEND_END_MODULE_GLOBALS(mysqlnd) -PHPAPI ZEND_DECLARE_MODULE_GLOBALS(mysqlnd); +PHPAPI ZEND_EXTERN_MODULE_GLOBALS(mysqlnd); #ifdef ZTS #define MYSQLND_G(v) TSRMG(mysqlnd_globals_id, zend_mysqlnd_globals *, v) Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_portability.h =================================================================== --- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_portability.h 2010-08-16 09:34:11 UTC (rev 302330) +++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_portability.h 2010-08-16 09:44:13 UTC (rev 302331) @@ -12,6 +12,8 @@ #ifndef MYSQLND_PORTABILITY_H #define MYSQLND_PORTABILITY_H + + /* Comes from global.h as OFFSET, renamed to STRUCT_OFFSET */ #define STRUCT_OFFSET(t, f) ((size_t)(char *)&((t *)0)->f)
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
