diff options
| author | Keyur Govande <keyur@php.net> | 2015-01-07 22:50:55 +0000 |
|---|---|---|
| committer | Keyur Govande <keyur@php.net> | 2015-01-07 22:50:55 +0000 |
| commit | 90144c0d083e9ecf390fc2a08ccb3c450d14ffab (patch) | |
| tree | 8c81d140f3eeaf994cf94205e8566117e810efd1 /ext/mysqlnd/config9.m4 | |
| parent | b0a26ab8f840ed1b48011caab3411c599f4451c5 (diff) | |
| parent | 9bbd55ddc7742b74152fd9339268c3340e6a08e5 (diff) | |
| download | php-git-90144c0d083e9ecf390fc2a08ccb3c450d14ffab.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Add NEWS
Patch commit d9f85373e32 by moving the float_to_double function to a header file.
Fix for bugs #68114 (Build fails on OS X due to undefined symbols) and #68657 (Reading 4 byte floats with Mysqli and libmysqlclient has rounding errors).
5.5.22 now
Conflicts:
configure.in
main/php_version.h
Diffstat (limited to 'ext/mysqlnd/config9.m4')
| -rw-r--r-- | ext/mysqlnd/config9.m4 | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/ext/mysqlnd/config9.m4 b/ext/mysqlnd/config9.m4 index 8f749cf273..0e08b977af 100644 --- a/ext/mysqlnd/config9.m4 +++ b/ext/mysqlnd/config9.m4 @@ -49,34 +49,3 @@ fi if test "$PHP_MYSQLND" != "no" || test "$PHP_MYSQLND_ENABLED" = "yes" || test "$PHP_MYSQLI" != "no"; then PHP_ADD_BUILD_DIR([ext/mysqlnd], 1) fi - -dnl -dnl Check if the compiler supports Decimal32/64/128 types from the IEEE-754 2008 version -dnl References: http://www.open-std.org/jtc1/sc22/wg14/www/docs/n1657.pdf -dnl http://speleotrove.com/decimal/ -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; - 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 -],[ - ac_cv_decimal_fp_supported=no -],[ - ac_cv_decimal_fp_supported=no -])]) -if test "$ac_cv_decimal_fp_supported" = "yes"; then - AC_DEFINE(HAVE_DECIMAL_FP_SUPPORT, 1, [Define if the compiler supports Decimal32/64/128 types.]) -fi |