From 294b04e9a63043a29a94a23c2d3bc3d3fa659bf2 Mon Sep 17 00:00:00 2001 From: Mark Pizzolato Date: Thu, 27 Jun 2024 17:37:13 -1000 Subject: [PATCH] Revert "Compile fix: replaced Uint8 by uint8." The "error" that the original change "fixed" was actually in the cmake build system and not in the sim_ws.c code. The Uint8 type is specific to SDL2 APIs. --- display/sim_ws.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/display/sim_ws.c b/display/sim_ws.c index 363c024b..47a573a0 100644 --- a/display/sim_ws.c +++ b/display/sim_ws.c @@ -77,8 +77,8 @@ static uint32 ncolors = 0, size_colors = 0; static uint32 *surface = NULL; static uint32 ws_palette[2]; /* Monochrome palette */ typedef struct cursor { - uint8 *data; - uint8 *mask; + Uint8 *data; + Uint8 *mask; int width; int height; int hot_x; @@ -310,8 +310,8 @@ static const char *cross[] = { static CURSOR *ws_create_cursor(const char *image[]) { int byte, bit, row, col; -uint8 *data = NULL; -uint8 *mask = NULL; +Uint8 *data = NULL; +Uint8 *mask = NULL; char black, white, transparent; CURSOR *result = NULL; int width, height, colors, cpp; @@ -325,8 +325,8 @@ if ((cpp != 1) || (0 != width%8) || (colors != 3)) black = image[1][0]; white = image[2][0]; transparent = image[3][0]; -data = (uint8 *)calloc (1, (width / 8) * height); -mask = (uint8 *)calloc (1, (width / 8) * height); +data = (Uint8 *)calloc (1, (width / 8) * height); +mask = (Uint8 *)calloc (1, (width / 8) * height); if (!data || !mask) { free (data); free (mask);