fix warnings, patch by Uffe Jakobsen

git-svn-id: https://svn.code.sf.net/p/vice-emu/code/trunk@45234 379a1393-f5fb-40a0-bcee-ef074d9b53f7
VICE-Team · Jul 15, 2024 · 3b0aa03 · 3b0aa03
1 parent f9107a6
commit 3b0aa03
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/vice/src/plus4/ted-snapshot.c b/vice/src/plus4/ted-snapshot.c
@@ -262,7 +262,7 @@ int ted_snapshot_read_module(snapshot_t *s)
 
     if (RasterCycle != (uint8_t)TED_RASTER_CYCLE(maincpu_clk)) {
         log_error(ted.log,
-                  "Not matching raster cycle (%d) in snapshot; should be %lu.",
+                  "Not matching raster cycle (%d) in snapshot; should be %u.",
                   RasterCycle, TED_RASTER_CYCLE(maincpu_clk));
         goto fail;
     }

diff --git a/vice/src/plus4/tedtypes.h b/vice/src/plus4/tedtypes.h
@@ -130,8 +130,7 @@ typedef enum ted_video_mode_s ted_video_mode_t;
                                                                   ? 1 - ted.screen_height : 1) : 0)) & 0x1ff))
 
 /* Cycle # within the current line.  */
-/*#define TED_RASTER_CYCLE(clk)       ((unsigned int)((clk) - ted.last_emulate_line_clk - (((clk) - ted.last_emulate_line_clk) >= 114 ? 114 : 0)))*/
-#define TED_RASTER_CYCLE(clk)       ((clk) - ted.last_emulate_line_clk - (((clk) - ted.last_emulate_line_clk) >= 114 ? 114 : 0))
+#define TED_RASTER_CYCLE(clk)       ((unsigned int)((clk) - ted.last_emulate_line_clk - (((clk) - ted.last_emulate_line_clk) >= 114 ? 114 : 0)))
 
 /* `clk' value for the beginning of the current line.  */
 /* FIXME: assigned to (CLOCK)ted.raster_irq_clk in ted-irq.c:ted_irq_set_raster_line() */