diff options
| author | Andrey Hristov <andrey@php.net> | 2010-08-13 09:57:04 +0000 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2010-08-13 09:57:04 +0000 |
| commit | a6100682d07441da087dd7442ec5f06b2408b0ae (patch) | |
| tree | 6532c65ba7c07c22aa27d7bb134e86920a3c80aa | |
| parent | 973e134d2d2719a105b7fcec7ea230c4157f9e93 (diff) | |
| download | php-git-a6100682d07441da087dd7442ec5f06b2408b0ae.tar.gz | |
Fix for bug #52413 MySQLi build failure on OS X
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | ext/mysqli/php_mysqli_structs.h | 4 |
2 files changed, 5 insertions, 0 deletions
@@ -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 diff --git a/ext/mysqli/php_mysqli_structs.h b/ext/mysqli/php_mysqli_structs.h index 41d14f2002..1324f5a458 100644 --- a/ext/mysqli/php_mysqli_structs.h +++ b/ext/mysqli/php_mysqli_structs.h @@ -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) |