summaryrefslogtreecommitdiff
path: root/ext/mysqlnd
diff options
context:
space:
mode:
authorKeyur Govande <keyur@php.net>2014-10-07 21:08:33 +0000
committerKeyur Govande <keyur@php.net>2014-10-07 21:08:33 +0000
commit07e285d880a892200ca9eb65d20179ea179968ec (patch)
tree637d0930c373b8afcdc00db51022ca989b92d35f /ext/mysqlnd
parentfe501914f0794b255057f4735461bb21366bc1f2 (diff)
parentbcda6c93929e313125e8cbe3b13cc77a6e8041ec (diff)
downloadphp-git-07e285d880a892200ca9eb65d20179ea179968ec.tar.gz
Merge branch 'PHP-5.6'
* PHP-5.6: Add to NEWS Fix for bug #68114 (Build fails on OS X due to undefined symbols)
Diffstat (limited to 'ext/mysqlnd')
-rw-r--r--ext/mysqlnd/config9.m47
1 files changed, 6 insertions, 1 deletions
diff --git a/ext/mysqlnd/config9.m4 b/ext/mysqlnd/config9.m4
index 816f4431f5..1a0136d8db 100644
--- a/ext/mysqlnd/config9.m4
+++ b/ext/mysqlnd/config9.m4
@@ -58,12 +58,17 @@ dnl
AC_CACHE_CHECK([whether whether compiler supports Decimal32/64/128 types], ac_cv_decimal_fp_supported,[
AC_TRY_RUN( [
#include <stdio.h>
+#include <string.h>
int main(int argc, char **argv) {
typedef float dec32 __attribute__((mode(SD)));
dec32 k = 99.49f;
double d2 = (double)k;
- return 0;
+ const char *check_str = "99.49";
+ char print_str[32];
+
+ snprintf(print_str, 32, "%f", d2);
+ return memcmp(print_str, check_str, 5);
}
],[
ac_cv_decimal_fp_supported=yes