andrey Fri, 13 Aug 2010 09:57:04 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=302179
Log: Fix for bug #52413 MySQLi build failure on OS X Bug: http://bugs.php.net/52413 (Assigned) MySQLi build failure on OS X Changed paths: U php/php-src/branches/PHP_5_3/NEWS U php/php-src/branches/PHP_5_3/ext/mysqli/php_mysqli_structs.h U php/php-src/trunk/ext/mysqli/php_mysqli_structs.h Modified: php/php-src/branches/PHP_5_3/NEWS =================================================================== --- php/php-src/branches/PHP_5_3/NEWS 2010-08-13 09:56:27 UTC (rev 302178) +++ php/php-src/branches/PHP_5_3/NEWS 2010-08-13 09:57:04 UTC (rev 302179) @@ -18,6 +18,7 @@ (Sriram Natarajan) - Fixed bug #52433 (Call to undefined method mysqli::poll() - must be static). (Andrey) +- Fixed bug #52413 (MySQLi/libmysql build failure on OS X, FreeBSD). (Andrey) - Fixed bug #52302 (mysqli_fetch_all does not work with MYSQLI_USE_RESULT). (Andrey) - Fixed bug #51610 (Using oci_connect causes PHP to take a long time to Modified: php/php-src/branches/PHP_5_3/ext/mysqli/php_mysqli_structs.h =================================================================== --- php/php-src/branches/PHP_5_3/ext/mysqli/php_mysqli_structs.h 2010-08-13 09:56:27 UTC (rev 302178) +++ php/php-src/branches/PHP_5_3/ext/mysqli/php_mysqli_structs.h 2010-08-13 09:57:04 UTC (rev 302179) @@ -54,6 +54,10 @@ #define WE_HAD_MBSTATE_T #endif +#if defined(ulong) && !defined(HAVE_ULONG) +#define HAVE_ULONG +#endif + #include <my_global.h> #if !defined(HAVE_MBRLEN) && defined(WE_HAD_MBRLEN) Modified: php/php-src/trunk/ext/mysqli/php_mysqli_structs.h =================================================================== --- php/php-src/trunk/ext/mysqli/php_mysqli_structs.h 2010-08-13 09:56:27 UTC (rev 302178) +++ php/php-src/trunk/ext/mysqli/php_mysqli_structs.h 2010-08-13 09:57:04 UTC (rev 302179) @@ -56,6 +56,10 @@ #define WE_HAD_MBSTATE_T #endif +#if defined(ulong) && !defined(HAVE_ULONG) +#define HAVE_ULONG +#endif + #include <my_global.h> #if !defined(HAVE_MBRLEN) && defined(WE_HAD_MBRLEN)
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
