From adb49159ce97fdc2040fcc3b5356af650b5af45c Mon Sep 17 00:00:00 2001 From: Solomon Peachy Date: Sun, 25 May 2025 07:55:10 -0400 Subject: [PATCH] winsim: Build fixes for current mingw64 cross compiles Change-Id: I5d523a4aa0ca9044b8f83ae6aafd4f3705ff96d6 --- apps/plugins/mikmod/mikmod.h | 2 +- firmware/target/hosted/sdl/button-sdl.c | 1 + firmware/target/hosted/sdl/system-sdl.c | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/apps/plugins/mikmod/mikmod.h b/apps/plugins/mikmod/mikmod.h index 36b39c15c2..749b535bdc 100644 --- a/apps/plugins/mikmod/mikmod.h +++ b/apps/plugins/mikmod/mikmod.h @@ -145,7 +145,7 @@ typedef unsigned short int UWORD; #if defined(_LP64) || defined(__LP64__) || defined(__arch64__) || defined(__alpha) || defined(__x86_64) || defined(__powerpc64__) /* 64 bit architectures: */ typedef signed int SLONG; -#if !defined(_MIKMOD_AMIGA) +#if !defined(_MIKMOD_AMIGA) && !defined(WIN32) typedef unsigned int ULONG; #endif diff --git a/firmware/target/hosted/sdl/button-sdl.c b/firmware/target/hosted/sdl/button-sdl.c index 734d6e4ec8..e1a5947d54 100644 --- a/firmware/target/hosted/sdl/button-sdl.c +++ b/firmware/target/hosted/sdl/button-sdl.c @@ -21,6 +21,7 @@ #include #include /* EXIT_SUCCESS */ +#include #include "sim-ui-defines.h" #ifdef HAVE_REMOTE_LCD #include "lcd-remote.h" diff --git a/firmware/target/hosted/sdl/system-sdl.c b/firmware/target/hosted/sdl/system-sdl.c index af067d8e86..b0a5ef8b4c 100644 --- a/firmware/target/hosted/sdl/system-sdl.c +++ b/firmware/target/hosted/sdl/system-sdl.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #ifdef __unix__