com php-src: Merge branch 'PHP-5.5' into PHP-5.6: ext/mysqli/my sqli_api.c ext/mysqlnd/config9.m4 ext/mysqlnd/mys qlnd_ps_codec.c

Commit: 90144c0d083e9ecf390fc2a08ccb3c450d14ffab Author: Keyur Govande <keyur@php.net> Wed, 7 Jan 2015 22:50:55 +0000 Parents: b0a26ab8f840ed1b48011caab3411c599f4451c5 9bbd55ddc7742b74152fd9339268c3340e6a08e5 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=90144c0d083e9ecf390fc2a08ccb3c450d14ffab Log: 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 Bugs: https://bugs.php.net/68114 https://bugs.php.net/68657 Changed paths: MM ext/mysqli/mysqli_api.c MM ext/mysqlnd/config9.m4 MM ext/mysqlnd/mysqlnd_ps_codec.c Diff: diff --cc ext/mysqlnd/config9.m4 index 8f749cf,09aca5a..0e08b97 --- a/ext/mysqlnd/config9.m4 +++ b/ext/mysqlnd/config9.m4 @@@ -48,35 -48,16 +48,4 @@@ f if test "$PHP_MYSQLND" != "no" || test "$PHP_MYSQLND_ENABLED" = "yes" || test "$PHP_MYSQLI" != "no"; then PHP_ADD_BUILD_DIR([ext/mysqlnd], 1) - - dnl This creates a file so it has to be after above macros - PHP_CHECK_TYPES([int8 uint8 int16 uint16 int32 uint32 uchar ulong int8_t uint8_t int16_t uint16_t int32_t uint32_t int64_t uint64_t], [ - ext/mysqlnd/php_mysqlnd_config.h - ],[ -#ifdef HAVE_SYS_TYPES_H -#include <sys/types.h> -#endif -#ifdef HAVE_STDINT_H -#include <stdint.h> -#endif - ]) 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