From 69277596b38f5953f072c3613390b5d16b236f82 Mon Sep 17 00:00:00 2001 From: Frode Solheim Date: Tue, 15 Jul 2025 22:46:42 +0200 Subject: [PATCH] Minor fixes to make custom.cpp and events.cpp to compile --- custom.cpp | 4 ++-- events.cpp | 2 +- include/custom.h | 3 +++ od-win32/screenshot.cpp | 2 -- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/custom.cpp b/custom.cpp index 1baffde2..45b55f61 100644 --- a/custom.cpp +++ b/custom.cpp @@ -3321,7 +3321,7 @@ static void intreq_checks(uae_u16 oldreq, uae_u16 newreq) serial_rbf_change((newreq & 0x0800) ? 1 : 0); } -void event_doint_delay_do_ext_old(uae_u32 v) +static void event_doint_delay_do_ext_old(uae_u32 v) { uae_u16 old = intreq2; setclr(&intreq, (1 << v) | 0x8000); @@ -3330,7 +3330,7 @@ void event_doint_delay_do_ext_old(uae_u32 v) doint(); } -void event_doint_delay_do_ext(uae_u32 v) +static void event_doint_delay_do_ext(uae_u32 v) { uae_u16 old = intreq2; setclr(&intreq, v | 0x8000); diff --git a/events.cpp b/events.cpp index 5878c30e..30bc5c00 100644 --- a/events.cpp +++ b/events.cpp @@ -24,6 +24,7 @@ #endif #include "audio.h" #include "cia.h" +#include "custom.h" extern uae_u8 agnus_hpos; int custom_fastmode; @@ -73,7 +74,6 @@ void events_schedule(void) } } -extern void vsync_event_done(void); extern int vsync_activeheight; static bool event_check_vsync(void) diff --git a/include/custom.h b/include/custom.h index 6f3af70c..2a4539ac 100644 --- a/include/custom.h +++ b/include/custom.h @@ -330,4 +330,7 @@ void resetfulllinestate(void); extern int current_linear_vpos, current_linear_hpos; extern uae_u8 agnus_hpos; +void vsync_event_done(void); +bool get_custom_color_reg(int colreg, uae_u8 *r, uae_u8 *g, uae_u8 *b); + #endif /* UAE_CUSTOM_H */ diff --git a/od-win32/screenshot.cpp b/od-win32/screenshot.cpp index 34894913..75657c7e 100644 --- a/od-win32/screenshot.cpp +++ b/od-win32/screenshot.cpp @@ -607,8 +607,6 @@ void Screenshot_RGBinfo (int rb, int gb, int bb, int ab, int rs, int gs, int bs, rgb_as = as; } -extern bool get_custom_color_reg(int colreg, uae_u8 *r, uae_u8 *g, uae_u8 *b); - static uae_u32 uniquecolors[256] = { 0 }; static int uniquecolorcount, uniquecolordepth; static uae_u8 *palettebm; -- 2.47.3