aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2011-08-08 15:36:04 +0200
committerHenrik Nord <[email protected]>2011-08-08 15:36:04 +0200
commit2f73f5ca35f600675ea9e46148bb8e9ddcdb4f7b (patch)
tree5093ddfdfca220209da7e52a9e6f40debb5b922b
parentb08528700ecb2c1b890617bcef84db6d61b5e931 (diff)
parent49f599b10882c7dc779d5b2bc06c4462f50209d1 (diff)
downloadotp-2f73f5ca35f600675ea9e46148bb8e9ddcdb4f7b.tar.gz
otp-2f73f5ca35f600675ea9e46148bb8e9ddcdb4f7b.tar.bz2
otp-2f73f5ca35f600675ea9e46148bb8e9ddcdb4f7b.zip
Merge branch 'dev' into major
-rw-r--r--erts/lib_src/common/erl_printf_format.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/lib_src/common/erl_printf_format.c b/erts/lib_src/common/erl_printf_format.c
index fba3fd723c..473791dce4 100644
--- a/erts/lib_src/common/erl_printf_format.c
+++ b/erts/lib_src/common/erl_printf_format.c
@@ -388,7 +388,7 @@ static int fmt_double(fmtfn_t fn,void*arg,double val,
max_size++;
if (precision)
max_size += precision;
- else if (fmt && FMTF_alt)
+ else if (fmt & FMTF_alt)
max_size++;
break;
case FMTC_E:
@@ -402,7 +402,7 @@ static int fmt_double(fmtfn_t fn,void*arg,double val,
max_size += 4;
if (precision)
max_size += precision;
- else if (fmt && FMTF_alt)
+ else if (fmt & FMTF_alt)
max_size++;
aexp = exp >= 0 ? exp : -exp;
if (aexp < 100)