diff options
| author | Keyur Govande <keyur@php.net> | 2014-10-07 21:08:18 +0000 |
|---|---|---|
| committer | Keyur Govande <keyur@php.net> | 2014-10-07 21:08:18 +0000 |
| commit | bcda6c93929e313125e8cbe3b13cc77a6e8041ec (patch) | |
| tree | fe666d6e466d18d5baa94c2553aea743633714f7 | |
| parent | 79ca53b62b512f478bf482548def4a812eed25b3 (diff) | |
| parent | d21602c07288283e680941c0c0f963715fed0337 (diff) | |
| download | php-git-bcda6c93929e313125e8cbe3b13cc77a6e8041ec.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Add to NEWS
Fix for bug #68114 (Build fails on OS X due to undefined symbols)
| -rw-r--r-- | ext/mysqlnd/config9.m4 | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/ext/mysqlnd/config9.m4 b/ext/mysqlnd/config9.m4 index 78e1bf1df0..8f749cf273 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 |