From a6100682d07441da087dd7442ec5f06b2408b0ae Mon Sep 17 00:00:00 2001
From: Andrey Hristov <andrey@php.net>
Date: Fri, 13 Aug 2010 09:57:04 +0000
Subject: [PATCH] Fix for bug #52413 MySQLi build failure on OS X

---
 NEWS                            | 1 +
 ext/mysqli/php_mysqli_structs.h | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/NEWS b/NEWS
index cb5f87c10e..0aa5dda492 100644
--- a/NEWS
+++ b/NEWS
@@ -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)
-- 
2.40.0