Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix for failing tests. gcc 4.8.3 would optimize away the assigment.
This commit is contained in:
Keyur Govande 2014-12-26 20:37:50 +00:00
commit 83e5547827

View file

@ -195,7 +195,8 @@ ps_fetch_float(zval * zv, const MYSQLND_FIELD * const field, unsigned int pack_l
#ifdef HAVE_DECIMAL_FP_SUPPORT
{
typedef float dec32 __attribute__((mode(SD)));
dec32 d32val = fval;
/* volatile so the compiler will not optimize away the conversion */
volatile dec32 d32val = fval;
/* The following cast is guaranteed to do the right thing */
dval = (double) d32val;