From 0178aa9a113dc224820fd638dc353dfe5ea6bee2 Mon Sep 17 00:00:00 2001
From: Damien George <damien.p.george@gmail.com>
Date: Mon, 12 Jan 2015 21:56:35 +0000
Subject: [PATCH] py, unix: Allow to compile with -Wdouble-promotion.
Ref issue #699.
---
py/objstr.c | 8 +++++++-
unix/modtime.c | 2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/py/objstr.c b/py/objstr.c
index 01ed3a2d3..879d1853d 100644
--- a/py/objstr.c
+++ b/py/objstr.c
@@ -1206,7 +1206,13 @@ mp_obj_t mp_obj_str_format(mp_uint_t n_args, const mp_obj_t *args, mp_map_t *kwa
case '%':
flags |= PF_FLAG_ADD_PERCENT;
- pfenv_print_float(&pfenv_vstr, mp_obj_get_float(arg) * 100.0F, 'f', flags, fill, width, precision);
+ #if MICROPY_FLOAT_IMPL == MICROPY_FLOAT_IMPL_FLOAT
+ #define F100 100.0F
+ #else
+ #define F100 100.0
+ #endif
+ pfenv_print_float(&pfenv_vstr, mp_obj_get_float(arg) * F100, 'f', flags, fill, width, precision);
+ #undef F100
break;
#endif
diff --git a/unix/modtime.c b/unix/modtime.c
index 2efb7fab3..61b5e0dd5 100644
--- a/unix/modtime.c
+++ b/unix/modtime.c
@@ -52,7 +52,7 @@ void msec_sleep_tv(struct timeval *tv) {
#endif
#if defined(MP_CLOCKS_PER_SEC)
-#define CLOCK_DIV (MP_CLOCKS_PER_SEC / 1000.0)
+#define CLOCK_DIV (MP_CLOCKS_PER_SEC / 1000.0F)
#else
#error Unsupported clock() implementation
#endif
--
GitLab