Package: uae
Severity: normal
Tags: patch

When building 'uae' on amd64 with gcc-4.0,
I get the following error:

gcc -I. -I../src/include/ -c  -O2 -fomit-frame-pointer  -Wall -Wno-unused 
-Wno-format -W -Wmissing-prototypes -Wstrict-prototypes   
-DGCCCONSTFUNC="__attribute__((const))" -DREGPARAM= -DUSE_ZFILE 
-DSUPPORT_THREADS -D_REENTRANT -DUAE_FILESYS_THREADS -D__inline__=inline 
-I/usr/X11R6/include -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 
-I/usr/lib/glib/include -DSHM_SUPPORT_LINKS=1   custom.c -o custom.o
custom.c:64: error: static declaration of 'vpos' follows non-static declaration
../src/include/custom.h:42: error: previous declaration of 'vpos' was here
custom.c:121: error: static declaration of 'sprite_width' follows non-static 
declaration
../src/include/drawing.h:34: error: previous declaration of 'sprite_width' was 
here
custom.c:266: error: static declaration of 'next_sprite_entry' follows 
non-static declaration
../src/include/drawing.h:200: error: previous declaration of 
'next_sprite_entry' was here
custom.c: In function 'update_fetch':

With the attached patch 'uae' can be compiled
on amd64 using gcc-4.0.

Regards
Andreas Jochens

diff -urN ../tmp-orig/uae-0.8.22/src/autoconf.c ./src/autoconf.c
--- ../tmp-orig/uae-0.8.22/src/autoconf.c       2001-12-30 15:15:56.000000000 
+0000
+++ ./src/autoconf.c    2005-02-28 09:30:28.051855761 +0000
@@ -219,7 +219,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 -urN ../tmp-orig/uae-0.8.22/src/custom.c ./src/custom.c
--- ../tmp-orig/uae-0.8.22/src/custom.c 2002-04-07 13:47:50.000000000 +0000
+++ ./src/custom.c      2005-02-28 09:31:41.386700783 +0000
@@ -61,7 +61,7 @@
 
 frame_time_t vsynctime, vsyncmintime;
 
-static int vpos;
+int vpos;
 static uae_u16 lof;
 static int next_lineno;
 static enum nln_how nextline_how;
@@ -118,7 +118,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;
+static int sprres, sprite_buffer_res;
+int sprite_width;
 
 static uae_u32 bpl1dat, bpl2dat, bpl3dat, bpl4dat, bpl5dat, bpl6dat, bpl7dat, 
bpl8dat;
 static uae_s16 bpl1mod, bpl2mod;
@@ -263,7 +264,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;
 


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to