Bug#297310: marked as done (ire: FTBFS (amd64/gcc-4.0): static declaration of 'radio_unsel_data' follows non-static declaration)
Debian Bug Tracking System
with message-id <E1EOnvR-...@spohr.debian.org>
and subject line Bug#297310: fixed in ire 0.92-2
has caused the attached Bug report to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what I am
talking about this indicates a serious mail system misconfiguration
somewhere. Please contact me immediately.)
Debian bug tracking system administrator
(administrator, Debian Bugs database)
--------------------------------------
Received: (at submit) by bugs.debian.org; 28 Feb 2005 15:03:31 +0000
>From a...@andaco.de Mon Feb 28 07:03:31 2005
Return-path: <a...@andaco.de>
Received: from c204041.adsl.hansenet.de (localhost.localdomain) [213.39.204.41]
by spohr.debian.org with esmtp (Exim 3.35 1 (Debian))
id 1D5mQk-0001i7-00; Mon, 28 Feb 2005 07:03:30 -0800
Received: from aj by localhost.localdomain with local (Exim 4.44)
id 1D5nN4-0002hD-RO; Mon, 28 Feb 2005 17:03:46 +0100
To: Debian Bug Tracking System <sub...@bugs.debian.org>
From: Andreas Jochens <a...@andaco.de>
Subject: ire: FTBFS (amd64/gcc-4.0): static declaration of 'radio_unsel_data' follows non-static declaration
Message-Id: <E1D5nN4-...@localhost.localdomain>
Date: Mon, 28 Feb 2005 17:03:46 +0100
Delivered-To: sub...@bugs.debian.org
X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2005_01_02
(1.212-2003-09-23-exp) on spohr.debian.org
X-Spam-Status: No, hits=-5.5 required=4.0 tests=BAYES_01,HAS_PACKAGE,
HTML_MESSAGE autolearn=no version=2.60-bugs.debian.org_2005_01_02
X-Spam-Level:
Package: ire
Severity: normal
Tags: patch
When building 'ire' on amd64 with gcc-4.0,
I get the following error:
make[1]: Entering directory `/ire-0.90.0'
gcc -c -Wall -g -O2 -I. -DPATH_FILES_DAT=\"//usr/share/games/ire/data/\" -DPATH_FILES_CONF=\"//etc/ire/\" -DALLEGRO -DBGUI `allegro-config --cflags` -DUSE_ALOGG -DUSE_ALSOUND `alogg-config --cflags` -DNO_ASM bgui2/src/bgfx.c -o bgui2/src/bgfx.o
bgui2/src/bgfx.c:33: error: static declaration of 'radio_unsel_data' follows non-static declaration
bgui2/src/binterna.h:14: error: previous declaration of 'radio_unsel_data' was here
bgui2/src/bgfx.c:50: error: static declaration of 'radio_sel_data' follows non-static declaration
bgui2/src/binterna.h:15: error: previous declaration of 'radio_sel_data' was here
bgui2/src/bgfx.c:67: error: static declaration of 'radio_grey_data' follows non-static declaration
bgui2/src/binterna.h:16: error: previous declaration of 'radio_grey_data' was here
make[1]: *** [bgui2/src/bgfx.o] Error 1
make[1]: Leaving directory `/ire-0.90.0'
make: *** [build-stamp] Error 2
With the attached patch 'ire' can be compiled
on amd64 using gcc-4.0.
Regards
Andreas Jochens
diff -urN ../tmp-orig/ire-0.90.0/bgui2/src/binterna.h ./bgui2/src/binterna.h
--- ../tmp-orig/ire-0.90.0/bgui2/src/binterna.h 2003-01-18 21:41:17.000000000 +0100
+++ ./bgui2/src/binterna.h 2005-02-28 16:57:51.462448673 +0100
@@ -11,10 +11,6 @@
extern BITMAP *radio_sel;
extern BITMAP *radio_grey;
-extern unsigned char radio_unsel_data[144];
-extern unsigned char radio_sel_data[144];
-extern unsigned char radio_grey_data[144];
-
typedef struct BILLWIN_INFO_STRUCTURE
{
BITMAP *backbuffer;
diff -urN ../tmp-orig/ire-0.90.0/console.h ./console.h
--- ../tmp-orig/ire-0.90.0/console.h 2003-03-11 22:47:48.000000000 +0100
+++ ./console.h 2005-02-28 16:57:51.462448673 +0100
@@ -35,7 +35,7 @@
extern void ShowSimple();
extern void Bug(char *msg,...);
extern void KillGFX();
-extern int console_x,console_y,console_w,console_h,ilog_break;
+extern int ilog_break;
extern FONT *curfont;
diff -urN ../tmp-orig/ire-0.90.0/library.cpp ./library.cpp
--- ../tmp-orig/ire-0.90.0/library.cpp 2003-05-04 03:39:06.000000000 +0200
+++ ./library.cpp 2005-02-28 16:57:51.463448480 +0100
@@ -807,13 +807,13 @@
MoveToFloor(object);
}
-int in_pocket(OBJECT *obj)
+long in_pocket(OBJECT *obj)
{
CHECK_OBJECT(obj);
// This looks like some nasty pointer trick, but we are actually returning
// the pointer as a boolean. If it's NULL, it's false, otherwise it's true
-return((int)obj->parent);
+return((long)obj->parent);
}
diff -urN ../tmp-orig/ire-0.90.0/library.hpp ./library.hpp
--- ../tmp-orig/ire-0.90.0/library.hpp 2003-02-13 23:55:44.000000000 +0100
+++ ./library.hpp 2005-02-28 16:57:51.463448480 +0100
@@ -93,7 +93,7 @@
extern int is_tile_solid(int x,int y);
extern int is_tile_water(int x,int y);
extern int is_solid(int x,int y);
-extern int in_pocket(OBJECT *o);
+extern long in_pocket(OBJECT *o);
extern int move_object(OBJECT *src,int x,int y);
extern void transfer_object(OBJECT *src,int x,int y);
extern int line_of_sight(int xa, int ya, int xb, int yb);
Binary files ../tmp-orig/ire-0.90.0/libs/linux/libbgui.a and ./libs/linux/libbgui.a differ
Binary files ../tmp-orig/ire-0.90.0/libs/linux/libithe.a and ./libs/linux/libithe.a differ
diff -urN ../tmp-orig/ire-0.90.0/loadsave.cpp ./loadsave.cpp
--- ../tmp-orig/ire-0.90.0/loadsave.cpp 2003-08-29 23:17:38.000000000 +0200
+++ ./loadsave.cpp 2005-02-28 16:57:51.464448287 +0100
@@ -59,7 +59,7 @@
static void fastfind_id_start();
static void fastfind_id_stop();
-static OBJECT *fastfind_id(unsigned int id);
+static OBJECT *fastfind_id(unsigned long id);
static int CMP_sort(const void *a, const void *b);
static int CMP_search(const void *a, const void *b);
@@ -1032,7 +1032,7 @@
while(temp)
{
next = temp->next;
- parent = fastfind_id((int)temp->parent);
+ parent = fastfind_id((long)temp->parent);
if(parent)
{
MoveToPocketEnd(temp,parent);
@@ -1052,18 +1052,18 @@
if(ptr->ptr)
{
if(ptr->ptr->target)
- ptr->ptr->target = fastfind_id((int)ptr->ptr->target);
+ ptr->ptr->target = fastfind_id((long)ptr->ptr->target);
if(ptr->ptr->enemy)
- ptr->ptr->enemy = fastfind_id((int)ptr->ptr->enemy);
+ ptr->ptr->enemy = fastfind_id((long)ptr->ptr->enemy);
if(ptr->ptr->stats->owner)
- ptr->ptr->stats->owner = fastfind_id((int)ptr->ptr->stats->owner);
+ ptr->ptr->stats->owner = fastfind_id((long)ptr->ptr->stats->owner);
// Convert any targets
if(ptr->ptr->schedule)
{
for(ctr2=0;ctr2<24;ctr2++)
if(ptr->ptr->schedule[ctr2].hour != -1)
- ptr->ptr->schedule[ctr2].target = fastfind_id((int)ptr->ptr->schedule[ctr2].target);
+ ptr->ptr->schedule[ctr2].target = fastfind_id((long)ptr->ptr->schedule[ctr2].target);
}
@@ -2522,7 +2522,7 @@
}
-static OBJECT *fastfind_id(unsigned int id)
+static OBJECT *fastfind_id(unsigned long id)
{
OBJECT **xx;
@@ -2545,7 +2545,7 @@
static int CMP_search(const void *a, const void *b)
{
-return (int)a - (*(OBJECT **)b)->save_id;
+return (long)a - (*(OBJECT **)b)->save_id;
}
/*
diff -urN ../tmp-orig/ire-0.90.0/map.cpp ./map.cpp
--- ../tmp-orig/ire-0.90.0/map.cpp 2002-12-08 10:18:58.000000000 +0100
+++ ./map.cpp 2005-02-28 16:58:19.871965113 +0100
@@ -23,7 +23,7 @@
if(x>=mapx && y>=mapy) // Check for a big object
if(x<mapx+VSW) // If onscreen
if(y<mapy+VSH)
- return (int)solidmap[VIEWDIST+x-mapx][VIEWDIST+y-mapy];
+ return (long)solidmap[VIEWDIST+x-mapx][VIEWDIST+y-mapy];
temp = curmap->objmap[ytab[y]+x]; // Now look at object map
for(;temp;temp=temp->next)
diff -urN ../tmp-orig/ire-0.90.0/pe/pe_sys.cpp ./pe/pe_sys.cpp
--- ../tmp-orig/ire-0.90.0/pe/pe_sys.cpp 2003-07-13 02:04:52.000000000 +0200
+++ ./pe/pe_sys.cpp 2005-02-28 16:59:05.084238310 +0100
@@ -1019,7 +1019,7 @@
// Look for a constant
k = find_keyword(number,'n',curfunc);
if(k)
- return((unsigned int)k->value);
+ return((unsigned long)k->value);
// Is it hexadecimal?
if(number[0] == '0')
@@ -1423,7 +1423,7 @@
return NULL;
for(k=klist[kl];k;k=k->next)
- if(type == k->type || type == '?' || k->type == '?')
+ if(type == k->type || type == '?' || k->type == '?')
{
// Check locals first..
if(k->local == func)
@@ -1434,18 +1434,18 @@
// Then look for a global that's local to this file
- if(k->local == NULL)
+ if(k->local == NULL)
{
if(k->localfile == compilename)
if(!stricmp(k->name,name))
- return k; // Found it!
+ return k; // Found it!
// Now search everywhere
-
+
if(k->localfile == NULL)
if(!stricmp(k->name,name))
return k; // Found it!
- }
+ }
}
// Oh well
diff -urN ../tmp-orig/ire-0.90.0/pe/pe_vm.cpp ./pe/pe_vm.cpp
--- ../tmp-orig/ire-0.90.0/pe/pe_vm.cpp 2003-07-22 01:29:14.000000000 +0200
+++ ./pe/pe_vm.cpp 2005-02-28 17:00:33.121245543 +0100
@@ -1583,14 +1583,14 @@
return;
ilog_quiet("(%s)\n",curvm->name);
-ilog_quiet("(%x-%x)\n",(unsigned int)curvm->code,(unsigned int)curvm->code+(unsigned int)curvm->size);
+ilog_quiet("(%lx-%lx)\n",(unsigned long)curvm->code,(unsigned long)curvm->code+(unsigned int)curvm->size);
oldip = curvm->ip;
curvm->ip = curvm->code;
-proglen = (unsigned int)curvm->codelen + (unsigned int)curvm->ip;
+proglen = (unsigned long)curvm->codelen + (unsigned long)curvm->ip;
//proglen = curvm->codelen + curvm->ip;
-for(;(unsigned int)curvm->ip<proglen;)
+for(;(unsigned long)curvm->ip<proglen;)
{
if(curvm->ip == lastip)
ilog_quiet("-> ");
@@ -5933,16 +5933,16 @@
void CheckRange(PEVM *vm, void *ptr, int ident)
{
-unsigned int a,b,c,d;
+unsigned long a,b,c,d;
-a=(unsigned int)vm->code;
-b=(unsigned int)vm->size;
+a=(unsigned long)vm->code;
+b=(unsigned long)vm->size;
c=a+b;
-d=(unsigned int)ptr;
+d=(unsigned long)ptr;
if(d<a || d>c)
{
- printf("%s: POINTER 0x%p OUT OF RANGE (0x%x-0x%x), ident %d\n",vm->name,ptr,a,c,ident);
+ printf("%s: POINTER 0x%p OUT OF RANGE (0x%lx-0x%lx), ident %d\n",vm->name,ptr,a,c,ident);
// CRASH();
}
}
diff -urN ../tmp-orig/ire-0.90.0/script.cpp ./script.cpp
--- ../tmp-orig/ire-0.90.0/script.cpp 2003-07-21 02:12:00.000000000 +0200
+++ ./script.cpp 2005-02-28 17:00:47.731425509 +0100
@@ -127,7 +127,7 @@
Section("sprites");
Section("sequences");
-Section("tiles");
+Section("tiles");
Section("characters");
Section("tables");
Section("tilelink");
@@ -424,9 +424,9 @@
// Most of the grunt-work has already been done, we just need to
// load in the sprite data for each entry.
//
-
-if(bookview[0]) // Not needed for the book viewer
- return;
+
+if(bookview[0]) // Not needed for the book viewer
+ return;
ilog_printf(" Load sprites..");
@@ -532,10 +532,10 @@
long ctr,pos,spos,tmp,list;
char *line,*Rptr;
long liststart=0,listend=0;
-
-if(bookview[0]) // Not needed for the book viewer
- return;
-
+
+if(bookview[0]) // Not needed for the book viewer
+ return;
+
ilog_printf(" Animation sequences");
Plot(SQtot);
@@ -854,7 +854,7 @@
for(ctr=0;ctr<pos;ctr++)
if(SQlist[ctr].flags&SEQFLAG_JUMPTO)
{
- strcpy(Rbuffer,strfirst(strrest(script.line[(int)SQlist[ctr].jumpto])));
+ strcpy(Rbuffer,strfirst(strrest(script.line[(long)SQlist[ctr].jumpto])));
tmp=getnum4sequence(Rbuffer);
if(tmp==-1)
Dump((long)SQlist[ctr].jumpto,"SQJT: Could not find sequence:",Rbuffer);
@@ -930,8 +930,8 @@
int hour,minute;
// Values for SETSOLID
-if(bookview[0]) // Not needed for the book viewer
- return;
+if(bookview[0]) // Not needed for the book viewer
+ return;
ilog_printf(" Setting up characters");
@@ -1896,9 +1896,9 @@
{
int ctr,tmp,pos,seqno,altcode;
char *line,*Rptr,*p;
-
-if(bookview[0]) // Not needed for the book viewer
- return;
+
+if(bookview[0]) // Not needed for the book viewer
+ return;
TItot = 0;
@@ -2030,7 +2030,7 @@
if(!strisnumber(Rbuffer))
Dump(ctr,"The movement cost must be a number.",NULL);
tmp=strgetnumber(Rbuffer);
- TIlist[pos].cost=tmp;
+ TIlist[pos].cost=tmp;
continue;
}
@@ -2146,19 +2146,19 @@
char *line;
OBJCODE *pe;
char msg[1024];
-
+
// Temporary structures for the PEscript compiler
int numfiles,func;
int *filefuncs;
// The PE list is just a straight list of files.
// We just get the first term and store it.
-
-if(bookview[0]) // Not needed for the book viewer
- return;
+
+if(bookview[0]) // Not needed for the book viewer
+ return;
if(editarea[0]) // Not needed for the area editor
- return;
+ return;
// First, see how many PE files we have. This != functions
@@ -2456,9 +2456,9 @@
long ctr,pos,imagedata;
char *Rptr;
char *line;
-
-if(bookview[0]) // Not needed for the book viewer
- return;
+
+if(bookview[0]) // Not needed for the book viewer
+ return;
// The rooftiles list is just a single list of sprite files:
//
@@ -2895,9 +2895,9 @@
char *line,*Rptr,*p;
// Tables are optional
-
-if(bookview[0]) // Not needed for the book viewer
- return;
+
+if(bookview[0]) // Not needed for the book viewer
+ return;
if(TLtot<1)
return;
---------------------------------------
Received: (at 297310-close) by bugs.debian.org; 10 Oct 2005 03:09:13 +0000
>From ka...@spohr.debian.org Sun Oct 09 20:09:13 2005
Return-path: <ka...@spohr.debian.org>
Received: from katie by spohr.debian.org with local (Exim 3.36 1 (Debian))
id 1EOnvR-0000bp-00; Sun, 09 Oct 2005 20:02:05 -0700
From: Alexandre Pineau <alexandr...@free.fr>
To: 297310...@bugs.debian.org
X-Katie: $Revision: 1.56 $
Subject: Bug#297310: fixed in ire 0.92-2
Message-Id: <E1EOnvR-...@spohr.debian.org>
Sender: Archive Administrator <ka...@spohr.debian.org>
Date: Sun, 09 Oct 2005 20:02:05 -0700
Delivered-To: 297310...@bugs.debian.org
X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2005_01_02
(1.212-2003-09-23-exp) on spohr.debian.org
X-Spam-Level:
X-Spam-Status: No, hits=-6.0 required=4.0 tests=BAYES_00,HAS_BUG_NUMBER
autolearn=no version=2.60-bugs.debian.org_2005_01_02
Source: ire
Source-Version: 0.92-2
We believe that the bug you reported is fixed in the latest version of
ire, which is due to be installed in the Debian FTP archive:
ire-ed_0.92-2_alpha.deb
to pool/main/i/ire/ire-ed_0.92-2_alpha.deb
ire_0.92-2.diff.gz
to pool/main/i/ire/ire_0.92-2.diff.gz
ire_0.92-2.dsc
to pool/main/i/ire/ire_0.92-2.dsc
ire_0.92-2_alpha.deb
to pool/main/i/ire/ire_0.92-2_alpha.deb
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to 297...@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Alexandre Pineau <alexandr...@free.fr> (supplier of updated ire package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpm...@debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Format: 1.7
Date: Wed, 17 Aug 2005 20:36:32 +0200
Source: ire
Binary: ire ire-ed
Architecture: source alpha
Version: 0.92-2
Distribution: unstable
Urgency: low
Maintainer: Alexandre Pineau <alexandr...@free.fr>
Changed-By: Alexandre Pineau <alexandr...@free.fr>
Description:
ire - A role-playing-game engine similar to Ultima 6
ire-ed - Create or modify games for the role-playing-game engine IRE
Closes: 297310
Changes:
ire (0.92-2) unstable; urgency=low
.
* fix issues with gcc-4.0 (Closes: #297310)
apply patch from Andreas Jochens (pe_sys.cpp, pe_vm.cpp, scripts.cpp)
* /ithelib/debug.c : va_list issue corrected (thanks to Julien Blache)
* Standards-Version bumped to 3.6.2.1 -- no changes.
Files:
f8866a6119008c3c1589b2d21e0a3ff1 666 games optional ire_0.92-2.dsc
245e7964de2516e317bf6c6850c7b9c9 150394 games optional ire_0.92-2.diff.gz
6f0c840febef96f6a43b8b898b1a6146 280038 games optional ire_0.92-2_alpha.deb
fc2e03544c9c5ef3528a6ec7ad7460a8 779008 games optional ire-ed_0.92-2_alpha.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
iD8DBQFDSdaLx2zlrBLK36URAn0WAKCG5je9mAcWR80BoOhJ9xB8Loj2uwCfbLRq
y8uGuSeLo5MpYlvShN6Zvcg=
=307u
-----END PGP SIGNATURE-----
--
To UNSUBSCRIBE, email to debian-bugs...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listm...@lists.debian.org