1 files changed, 10 insertions, 6 deletions

diff --git a/apps/plugins/puzzles/src/drawing.c b/apps/plugins/puzzles/src/drawing.c
index a8eb8cfd5f..2c8816c31a 100644
--- a/apps/plugins/puzzles/src/drawing.c
+++ b/apps/plugins/puzzles/src/drawing.c
@@ -27,7 +27,11 @@
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
-#include <math.h>
+#ifdef NO_TGMATH_H
+#  include <math.h>
+#else
+#  include <tgmath.h>
+#endif
 
 #include "puzzles.h"
 
@@ -90,8 +94,8 @@ void draw_line(drawing *dr, int x1, int y1, int x2, int y2, int colour)
 void draw_thick_line(drawing *dr, float thickness,
                      float x1, float y1, float x2, float y2, int colour)
 {
-    if (thickness < 1.0)
-        thickness = 1.0;
+    if (thickness < 1.0F)
+        thickness = 1.0F;
     if (dr->api->draw_thick_line) {
         dr->api->draw_thick_line(dr->handle, thickness,
                                  x1, y1, x2, y2, colour);
@@ -101,8 +105,8 @@ void draw_thick_line(drawing *dr, float thickness,
          * polygon rendering uses integer coordinates.
          */
         float len = sqrt((x2 - x1)*(x2 - x1) + (y2 - y1)*(y2 - y1));
-        float tvhatx = (x2 - x1)/len * (thickness/2 - 0.2);
-        float tvhaty = (y2 - y1)/len * (thickness/2 - 0.2);
+        float tvhatx = (x2 - x1)/len * (thickness/2 - 0.2F);
+        float tvhaty = (y2 - y1)/len * (thickness/2 - 0.2F);
         int p[8];
 
         p[0] = x1 - tvhaty;
@@ -117,7 +121,7 @@ void draw_thick_line(drawing *dr, float thickness,
     }
 }
 
-void draw_polygon(drawing *dr, int *coords, int npoints,
+void draw_polygon(drawing *dr, const int *coords, int npoints,
                   int fillcolour, int outlinecolour)
 {
     dr->api->draw_polygon(dr->handle, coords, npoints, fillcolour,