Minor fixes to make custom.cpp and events.cpp to compile

diff --git a/custom.cpp b/custom.cpp
index 1baffde25ff7f336e74731753efa672c16debcce..45b55f61a2e75eb1844317f0a83588e9f3614845 100644 (file)
--- 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 5878c30e90e847f267fbab7cb3ff1706a8e22b85..30bc5c0019b04740af5cff2c1ee72588f1dedb7f 100644 (file)
--- 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 6f3af70c44af900e60f9b206e889d47497fb9a59..2a4539acd61b2420141c04fc19717cda204206dd 100644 (file)
--- 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 34894913bdf380fe4e7e9211e676eefec5690994..75657c7e8520be6d72e4c6ccbf527c094214925f 100644 (file)
--- 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;