[patch] Patch for e-uae

e-uae-gcc41.patch (text/plain), 5.24 KB, created by Stephen Bridges on 2006-05-21 09:42:25 UTC

diff -urbB e-uae-0.8.27-orig/src/autoconf.c e-uae-0.8.27/src/autoconf.c
--- e-uae-0.8.27-orig/src/autoconf.c	2004-06-05 20:23:14.000000000 +0100
+++ e-uae-0.8.27/src/autoconf.c	2006-05-21 16:42:13.000000000 +0100
@@ -267,7 +267,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 -urbB e-uae-0.8.27-orig/src/blkdev.c e-uae-0.8.27/src/blkdev.c
--- e-uae-0.8.27-orig/src/blkdev.c	2004-08-04 23:13:41.000000000 +0100
+++ e-uae-0.8.27/src/blkdev.c	2006-05-21 16:44:48.000000000 +0100
@@ -14,7 +14,7 @@
 
 #include "blkdev.h"
 
-static struct device_functions *device_func[2];
+struct device_functions *device_func[2];
 static int have_ioctl;
 
 #ifdef WIN32
diff -urbB e-uae-0.8.27-orig/src/cia.c e-uae-0.8.27/src/cia.c
--- e-uae-0.8.27-orig/src/cia.c	2004-11-26 03:18:13.000000000 +0000
+++ e-uae-0.8.27/src/cia.c	2006-05-21 16:41:35.000000000 +0100
@@ -58,16 +58,16 @@
 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 int oldled, oldovl;
 
 unsigned int ciabpra;
diff -urbB e-uae-0.8.27-orig/src/custom.c e-uae-0.8.27/src/custom.c
--- e-uae-0.8.27-orig/src/custom.c	2004-12-15 03:56:47.000000000 +0000
+++ e-uae-0.8.27/src/custom.c	2006-05-21 16:40:15.000000000 +0100
@@ -172,7 +172,7 @@
 #endif
 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, sprres, sprite_buffer_res;
 
 #ifdef CPUEMU_6
 uae_u8 cycle_line[256];
@@ -332,7 +332,7 @@
 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;
+int next_sprite_entry = 0;
 static int prev_next_sprite_entry;
 static int next_sprite_forced = 1;
 
diff -urbB e-uae-0.8.27-orig/src/include/hotkeys.h e-uae-0.8.27/src/include/hotkeys.h
--- e-uae-0.8.27-orig/src/include/hotkeys.h	2004-05-19 02:21:54.000000000 +0100
+++ e-uae-0.8.27/src/include/hotkeys.h	2006-05-21 16:31:25.000000000 +0100
@@ -9,6 +9,8 @@
   * in x11win.c and sdlgfx.c
   */
 
+#ifndef _GCC41_FIX_HOTKEYS_H
+#define _GCC41_FIX_HOTKEYS_H
 
 /* Maximum number of keys in a sequence */
 #define HOTKEYSEQ_MAXKEYS	4
@@ -37,3 +39,5 @@
 {
     handle_input_event (event, state, 0, 0);
 }
+
+#endif
Only in e-uae-0.8.27-orig/src/include: hotkeys.h.new
diff -urbB e-uae-0.8.27-orig/src/inputdevice.c e-uae-0.8.27/src/inputdevice.c
--- e-uae-0.8.27-orig/src/inputdevice.c	2004-12-02 08:50:12.000000000 +0000
+++ e-uae-0.8.27/src/inputdevice.c	2006-05-21 16:43:58.000000000 +0100
@@ -1779,7 +1779,7 @@
     return 0;
 }
 
-static struct inputdevice_functions idev[3];
+struct inputdevice_functions idev[3];
 
 void inputdevice_init (void)
 {
diff -urbB e-uae-0.8.27-orig/src/keymap/beos_rawkeys.h e-uae-0.8.27/src/keymap/beos_rawkeys.h
--- e-uae-0.8.27-orig/src/keymap/beos_rawkeys.h	2004-10-06 08:39:09.000000000 +0100
+++ e-uae-0.8.27/src/keymap/beos_rawkeys.h	2006-05-21 16:31:25.000000000 +0100
@@ -6,5 +6,7 @@
   * Copyright 2004 Richard Drummond
   */
 
+#include "hotkeys.h"
+
 extern const struct uaekey_hostmap beos_keymap[];
 extern       struct uae_hotkeyseq  beos_hotkeys[];
Only in e-uae-0.8.27-orig/src/keymap: beos_rawkeys.h.new
diff -urbB e-uae-0.8.27-orig/src/keymap/x11pc_rawkeys.h e-uae-0.8.27/src/keymap/x11pc_rawkeys.h
--- e-uae-0.8.27-orig/src/keymap/x11pc_rawkeys.h	2004-10-06 09:06:09.000000000 +0100
+++ e-uae-0.8.27/src/keymap/x11pc_rawkeys.h	2006-05-21 16:31:25.000000000 +0100
@@ -7,6 +7,8 @@
   * Copyright 2004 Richard Drummond
   */
 
+#include "hotkeys.h"
+
 extern const struct uaekey_hostmap x11pc_keymap[];
 extern       struct uae_hotkeyseq  x11pc_hotkeys[];
 #if 0
Only in e-uae-0.8.27-orig/src/keymap: x11pc_rawkeys.h.new
diff -urbB e-uae-0.8.27-orig/src/picasso96.c e-uae-0.8.27/src/picasso96.c
--- e-uae-0.8.27-orig/src/picasso96.c	2005-01-02 04:58:16.000000000 +0000
+++ e-uae-0.8.27/src/picasso96.c	2006-05-21 16:42:53.000000000 +0100
@@ -47,14 +47,14 @@
 #ifdef JIT
 int        have_done_picasso       = 0;         /* For the JIT compiler */
 # ifdef PICASSO96
-static int picasso_is_special      = PIC_WRITE; /* ditto */
-static int picasso_is_special_read = PIC_READ;  /* ditto */
+int picasso_is_special      = PIC_WRITE; /* ditto */
+int picasso_is_special_read = PIC_READ;  /* ditto */
 # endif
 #endif
 
 #ifdef PICASSO96
 
-static int p96syncrate;
+int p96syncrate;
 int p96hsync_counter;
 
 int p96hack_vpos, p96hack_vpos2, p96refresh_active;