Package: crossfire
Severity: normal
Tags: patch
When building 'crossfire' on amd64 with gcc-4.0,
I get the following error:
cc -DHAVE_CONFIG_H -I. -I/crossfire-1.6.0/./common -I../include
-I/crossfire-1.6.0/./include -DDATADIR=\"/usr/share/games/crossfire\"
-DCONFDIR=\"/etc/crossfire\" -DLIBDIR=\"/usr/games/lib/crossfire\"
-DLOCALDIR=\"/var/games/crossfire\" -g -Wall -O2 -c `test -f
'/crossfire-1.6.0/./common/living.c' || echo
'/crossfire-1.6.0/./common/'`/crossfire-1.6.0/./common/living.c
/crossfire-1.6.0/./common/living.c:174: error: static declaration of
'savethrow' follows non-static declaration
/crossfire-1.6.0/./include/living.h:56: error: previous declaration of
'savethrow' was here
make[2]: *** [living.o] Error 1
make[2]: Leaving directory `/crossfire-1.6.0/build/common'
With the attached patch 'crossfire' can be compiled
on amd64 using gcc-4.0.
Regards
Andreas Jochens
diff -urN ../tmp-orig/crossfire-1.6.0/include/living.h ./include/living.h
--- ../tmp-orig/crossfire-1.6.0/include/living.h 2003-09-13
07:01:33.000000000 +0200
+++ ./include/living.h 2005-03-01 16:37:41.446210043 +0100
@@ -53,7 +53,6 @@
extern int turn_bonus[MAX_STAT + 1];
extern int max_carry[MAX_STAT + 1];
extern int dam_bonus[MAX_STAT + 1];
-extern int savethrow[111];
extern int turn_bonus[MAX_STAT + 1];
extern int learn_prayer_chance[MAX_STAT + 1];
extern int learn_spell[];
diff -urN ../tmp-orig/crossfire-1.6.0/socket/request.c ./socket/request.c
--- ../tmp-orig/crossfire-1.6.0/socket/request.c 2004-02-11
09:09:29.000000000 +0100
+++ ./socket/request.c 2005-03-01 16:41:46.435922509 +0100
@@ -736,7 +736,7 @@
AddIfFloat(pl->last_speed, pl->ob->speed, CS_STAT_SPEED);
AddIfShort(pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD);
AddIfFloat(pl->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP);
- AddIfInt( ( sint32 )pl->last_weight_limit,
weight_limit[pl->ob->stats.Str], CS_STAT_WEIGHT_LIM);
+ AddIfInt( pl->last_weight_limit, weight_limit[pl->ob->stats.Str],
CS_STAT_WEIGHT_LIM);
flags=0;
if (pl->fire_on) flags |=SF_FIREON;
if (pl->run_on) flags |= SF_RUNON;
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
