From 4d261a79392ccf6c04441b2e1b63d23665d7281f Mon Sep 17 00:00:00 2001 From: tron Date: Sun, 2 Jul 2006 15:47:16 +0000 Subject: Fix various inconsistent "static" vs. "extern" declarations which broke the build with GCC 4.x. --- emulators/uae/distinfo | 6 +++++- emulators/uae/patches/patch-ad | 27 +++++++++++++++++++++++++++ emulators/uae/patches/patch-ae | 30 ++++++++++++++++++++++++++++++ emulators/uae/patches/patch-af | 13 +++++++++++++ emulators/uae/patches/patch-ag | 24 ++++++++++++++++++++++++ 5 files changed, 99 insertions(+), 1 deletion(-) create mode 100644 emulators/uae/patches/patch-ad create mode 100644 emulators/uae/patches/patch-ae create mode 100644 emulators/uae/patches/patch-af create mode 100644 emulators/uae/patches/patch-ag diff --git a/emulators/uae/distinfo b/emulators/uae/distinfo index efc5b9bdce4..e4662a871c7 100644 --- a/emulators/uae/distinfo +++ b/emulators/uae/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.14 2006/04/28 15:10:18 joerg Exp $ +$NetBSD: distinfo,v 1.15 2006/07/02 15:47:16 tron Exp $ SHA1 (uae-0.8.25.tar.gz) = 41b7a70cf672d3cc516bd3856a051459a95a6517 RMD160 (uae-0.8.25.tar.gz) = 6990dc7aaf43c8bda0d7b86e6d0ae164209d1eb1 @@ -6,3 +6,7 @@ Size (uae-0.8.25.tar.gz) = 970727 bytes SHA1 (patch-aa) = c185427ad9042e0e81ec4990c0ae4b5e6977a74e SHA1 (patch-ab) = 4dc5d66008a9c056c7a93f74d25c4778d4f1b6cb SHA1 (patch-ac) = 94e15570fe9d8df48945be0e1f2a723826e2ceda +SHA1 (patch-ad) = 6ac0d9bd6e60408f366f050898ae87e8730466ec +SHA1 (patch-ae) = 9235c20d2a60b3c48e87eb23463a14f558e0de4e +SHA1 (patch-af) = ca05a7ec786d48e488d3b29e0650da1ef4f67d37 +SHA1 (patch-ag) = f62849869131a4ce3c87c4f3596fe2479ca3df8e diff --git a/emulators/uae/patches/patch-ad b/emulators/uae/patches/patch-ad new file mode 100644 index 00000000000..6f92546faee --- /dev/null +++ b/emulators/uae/patches/patch-ad @@ -0,0 +1,27 @@ +$NetBSD: patch-ad,v 1.3 2006/07/02 15:47:16 tron Exp $ + +--- src/custom.c.orig 2005-07-02 17:24:06.000000000 +0100 ++++ src/custom.c 2006-07-02 16:38:58.000000000 +0100 +@@ -111,7 +111,8 @@ + static uae_u16 sprdata[MAX_SPRITES][4], sprdatb[MAX_SPRITES][4]; + static int sprite_last_drawn_at[MAX_SPRITES]; + static int last_sprite_point, nr_armed; +-static int sprite_width, sprres, sprite_buffer_res; ++int sprite_width; ++static int sprres, sprite_buffer_res; + + static uae_u32 bpl1dat, bpl2dat, bpl3dat, bpl4dat, bpl5dat, bpl6dat, bpl7dat, bpl8dat; + static uae_s16 bpl1mod, bpl2mod; +@@ -234,9 +235,9 @@ + struct draw_info line_drawinfo[2][2 * (MAXVPOS + 1) + 1]; + struct color_entry color_tables[2][(MAXVPOS + 1) * 2]; + +-static int next_sprite_entry = 0; +-static int prev_next_sprite_entry; +-static int next_sprite_forced = 1; ++int next_sprite_entry = 0; ++int prev_next_sprite_entry; ++int next_sprite_forced = 1; + + struct sprite_entry *curr_sprite_entries, *prev_sprite_entries; + struct color_change *curr_color_changes, *prev_color_changes; diff --git a/emulators/uae/patches/patch-ae b/emulators/uae/patches/patch-ae new file mode 100644 index 00000000000..d5067eb608a --- /dev/null +++ b/emulators/uae/patches/patch-ae @@ -0,0 +1,30 @@ +$NetBSD: patch-ae,v 1.1 2006/07/02 15:47:16 tron Exp $ + +--- src/cia.c.orig 2005-07-02 17:24:06.000000000 +0100 ++++ src/cia.c 2006-07-02 16:29:42.000000000 +0100 +@@ -46,18 +46,18 @@ + static unsigned int clock_control_e = 0; + static unsigned int clock_control_f = RTC_F_24_12; + +-static unsigned int ciaaicr, ciaaimask, ciabicr, ciabimask; +-static unsigned int ciaacra, ciaacrb, ciabcra, ciabcrb; ++unsigned int ciaaicr, ciaaimask, ciabicr, ciabimask; ++unsigned int ciaacra, ciaacrb, ciabcra, ciabcrb; + + /* Values of the CIA timers. */ +-static unsigned long ciaata, ciaatb, ciabta, ciabtb; ++unsigned long ciaata, ciaatb, ciabta, ciabtb; + /* Computed by compute_passed_time. */ +-static unsigned long ciaata_passed, ciaatb_passed, ciabta_passed, ciabtb_passed; ++unsigned long ciaata_passed, ciaatb_passed, ciabta_passed, ciabtb_passed; + +-static unsigned long ciaatod, ciabtod, ciaatol, ciabtol, ciaaalarm, ciabalarm; +-static int ciaatlatch, ciabtlatch; ++unsigned long ciaatod, ciabtod, ciaatol, ciabtol, ciaaalarm, ciabalarm; ++int ciaatlatch, ciabtlatch; + +-static unsigned int ciabpra; ++unsigned int ciabpra; + + unsigned int gui_ledstate; + diff --git a/emulators/uae/patches/patch-af b/emulators/uae/patches/patch-af new file mode 100644 index 00000000000..140660ebd79 --- /dev/null +++ b/emulators/uae/patches/patch-af @@ -0,0 +1,13 @@ +$NetBSD: patch-af,v 1.1 2006/07/02 15:47:16 tron Exp $ + +--- src/autoconf.c.orig 2004-10-10 16:53:32.000000000 +0100 ++++ src/autoconf.c 2006-07-02 16:31:19.000000000 +0100 +@@ -218,7 +218,7 @@ + + /* ROM tag area memory access */ + +-static uae_u8 *rtarea; ++uae_u8 *rtarea; + + static uae_u32 rtarea_lget (uaecptr) REGPARAM; + static uae_u32 rtarea_wget (uaecptr) REGPARAM; diff --git a/emulators/uae/patches/patch-ag b/emulators/uae/patches/patch-ag new file mode 100644 index 00000000000..96dc0d18fc1 --- /dev/null +++ b/emulators/uae/patches/patch-ag @@ -0,0 +1,24 @@ +$NetBSD: patch-ag,v 1.1 2006/07/02 15:47:16 tron Exp $ + +--- src/inputdevice.c.orig 2005-07-02 17:23:50.000000000 +0100 ++++ src/inputdevice.c 2006-07-02 16:33:10.000000000 +0100 +@@ -511,8 +511,8 @@ + + /* Mousehack stuff */ + +-static int ievent_alive = 0; +-static int lastmx, lastmy; ++int ievent_alive = 0; ++int lastmx, lastmy; + + int mousehack_alive (void) + { +@@ -1739,7 +1739,7 @@ + return 0; + } + +-static struct inputdevice_functions idev[3]; ++struct inputdevice_functions idev[3]; + + void inputdevice_init (void) + { -- cgit v1.2.3