<URL: http://bugs.freeciv.org/Ticket/Display.html?id=39947 >
Looked like the previous patch wasn't complete ... this should take care of
it.
On 2007-12-04 at 19:38:26 [+0000], The default queue <[EMAIL PROTECTED]>
wrote:
>
> Greetings,
>
> This message has been automatically generated in response to the
> creation of a trouble ticket regarding:
> "beos sdl-client",
> a summary of which appears below.
>
> There is no need to reply to this message right now. Your ticket has been
> assigned an ID of (PR#39947).
>
> Please include the string:
>
> (PR#39947)
>
> in the subject line of all future correspondence about this issue. To do so,
> you may reply to this message.
>
> Thank you,
>
>
> -------------------------------------------------------------------------
> Third (second one went to [EMAIL PROTECTED] as stated on the bugs site) try,
> seems the previous one ended up in a fixed ticket (sorry for
> that). This fix lets the build (sdl) compile completly (checked with the
> trunk checkout r14131)
>
> Greetings
diff -Nur freeciv2.2/ai/aicity.c freeciv2.2_beos/ai/aicity.c
--- freeciv2.2/ai/aicity.c Wed Nov 28 18:06:09 2007
+++ freeciv2.2_beos/ai/aicity.c Wed Nov 28 21:30:03 2007
@@ -793,7 +793,7 @@
struct government *gov = government_of_player(pplayer);
struct universal source = {
.kind = VUT_IMPROVEMENT,
- .value.building = pimprove
+ .value = {.building = pimprove}
};
const bool is_coinage = improvement_has_flag(pimprove, IF_GOLD);
diff -Nur freeciv2.2/ai/aidata.c freeciv2.2_beos/ai/aidata.c
--- freeciv2.2/ai/aidata.c Wed Nov 28 18:06:09 2007
+++ freeciv2.2_beos/ai/aidata.c Wed Nov 28 21:30:29 2007
@@ -66,7 +66,7 @@
improvement_iterate(pimprove) {
struct universal source = {
.kind = VUT_IMPROVEMENT,
- .value.building = pimprove
+ .value = {.building = pimprove}
};
ai->impr_calc[improvement_index(pimprove)] = AI_IMPR_ESTIMATE;
diff -Nur freeciv2.2/client/climisc.c freeciv2.2_beos/client/climisc.c
--- freeciv2.2/client/climisc.c Wed Nov 28 18:06:27 2007
+++ freeciv2.2_beos/client/climisc.c Wed Nov 28 21:39:43 2007
@@ -460,7 +460,7 @@
{
struct universal target = {
.kind = VUT_UTYPE,
- .value.utype = punittype};
+ .value = {.utype = punittype}};
return cid_encode(target);
}
@@ -472,7 +472,7 @@
{
struct universal target = {
.kind = VUT_IMPROVEMENT,
- .value.building = pimprove
+ .value = {.building = pimprove}
};
return cid_encode(target);
diff -Nur freeciv2.2/client/helpdata.c freeciv2.2_beos/client/helpdata.c
--- freeciv2.2/client/helpdata.c Wed Nov 28 18:06:27 2007
+++ freeciv2.2_beos/client/helpdata.c Wed Nov 28 21:41:54 2007
@@ -657,7 +657,7 @@
{
struct universal source = {
.kind = VUT_IMPROVEMENT,
- .value.building = pimprove
+ .value = {.building = pimprove}
};
assert(buf);
@@ -1084,7 +1084,7 @@
struct advance *vap = valid_advance_by_number(i);
struct universal source = {
.kind = VUT_ADVANCE,
- .value.advance = vap
+ .value = {.advance = vap}
};
assert(buf&&user_text);
@@ -1173,7 +1173,7 @@
{
struct universal source = {
.kind = VUT_TERRAIN,
- .value.terrain = pterrain
+ .value ={.terrain = pterrain}
};
buf[0] = '\0';
@@ -1229,7 +1229,7 @@
{
struct universal source = {
.kind = VUT_GOVERNMENT,
- .value.govern = gov
+ .value = {.govern = gov}
};
buf[0] = '\0';
diff -Nur freeciv2.2/client/mapctrl_common.c
freeciv2.2_beos/client/mapctrl_common.c
--- freeciv2.2/client/mapctrl_common.c Wed Nov 28 18:06:27 2007
+++ freeciv2.2_beos/client/mapctrl_common.c Wed Nov 28 21:42:30 2007
@@ -60,7 +60,7 @@
/* The mapcanvas clipboard */
struct universal clipboard =
{ .kind = VUT_NONE,
- .value.building = NULL
+ .value = {.building = NULL}
};
/* Goto with drag and drop. */
diff -Nur freeciv2.2/client/tilespec.c freeciv2.2_beos/client/tilespec.c
--- freeciv2.2/client/tilespec.c Wed Nov 28 18:06:27 2007
+++ freeciv2.2_beos/client/tilespec.c Wed Nov 28 21:43:46 2007
@@ -4226,6 +4226,7 @@
/* Unit drawing is disabled if the view options is turned off, but only
* if we're drawing on the mapview. */
+ {
bool do_draw_unit = (punit && (draw_units || !ptile
|| (draw_focus_unit
&& unit_is_in_focus(punit))));
@@ -4494,6 +4495,7 @@
}
return sprs - save_sprs;
+ }
}
/**********************************************************************
diff -Nur freeciv2.2/common/effects.c freeciv2.2_beos/common/effects.c
--- freeciv2.2/common/effects.c Wed Nov 28 18:06:06 2007
+++ freeciv2.2_beos/common/effects.c Wed Nov 28 21:27:58 2007
@@ -539,7 +539,7 @@
struct universal source = {
.kind = VUT_IMPROVEMENT,
/* just to bamboozle the annoying compiler warning */
- .value.building = improvement_by_number(improvement_number(pimprove))
+ .value = {.building = improvement_by_number(improvement_number(pimprove))}
};
struct effect_list *plist = get_req_source_effects(&source);
@@ -694,7 +694,7 @@
struct effect_list *plist;
struct universal source = {
.kind = VUT_IMPROVEMENT,
- .value.building = pimprove
+ .value = {.building = pimprove}
};
/* A capitalization production is never redundant. */
@@ -1011,7 +1011,7 @@
struct impr_type *building = pcity->production.value.building;
struct universal source = {
.kind = VUT_IMPROVEMENT,
- .value.building = building
+ .value = {.building = building}
};
struct effect_list *plist = get_req_source_effects(&source);
int power = 0;
diff -Nur freeciv2.2/common/generate_packets.py
freeciv2.2_beos/common/generate_packets.py
--- freeciv2.2/common/generate_packets.py Wed Nov 28 18:06:06 2007
+++ freeciv2.2_beos/common/generate_packets.py Wed Nov 28 21:21:28 2007
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/bin/env python
#
# Freeciv - Copyright (C) 2003 - Raimar Falke
diff -Nur freeciv2.2/server/cityturn.c freeciv2.2_beos/server/cityturn.c
--- freeciv2.2/server/cityturn.c Wed Nov 28 18:03:31 2007
+++ freeciv2.2_beos/server/cityturn.c Wed Nov 28 21:34:34 2007
@@ -638,7 +638,7 @@
if (valid_improvement(choice.value.building)) {
struct universal target = {
.kind = VUT_IMPROVEMENT,
- .value.building = choice.value.building
+ .value = {.building = choice.value.building}
};
change_build_target(pplayer, pcity, target, E_IMP_AUTO);
@@ -651,7 +651,7 @@
&& !building_has_effect(pimprove, EFT_CAPITAL_CITY)) {
struct universal target = {
.kind = VUT_IMPROVEMENT,
- .value.building = pimprove
+ .value = {.building = pimprove}
};
change_build_target(pplayer, pcity, target, E_IMP_AUTO);
diff -Nur freeciv2.2/server/savegame.c freeciv2.2_beos/server/savegame.c
--- freeciv2.2/server/savegame.c Wed Nov 28 18:03:31 2007
+++ freeciv2.2_beos/server/savegame.c Wed Nov 28 21:35:55 2007
@@ -3001,6 +3001,7 @@
i = -1;
unit_list_iterate(plr->units, punit) {
i++;
+ {
int activity;
secfile_insert_int(file, punit->id, "player%d.u%d.id", plrno, i);
@@ -3455,6 +3456,7 @@
}
#undef PART_ADJUST
#undef PART_SIZE
+ }
}
_______________________________________________
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev
