Author: cazfi
Date: Thu Apr 23 23:07:56 2015
New Revision: 28854

URL: http://svn.gna.org/viewcvs/freeciv?rev=28854&view=rev
Log:
Define packet_ruleset_terrain_control before use in map.h

See patch #6018

Modified:
    branches/S2_6/ai/default/ailog.c
    branches/S2_6/ai/default/daieffects.c
    branches/S2_6/common/achievements.c
    branches/S2_6/common/actions.c
    branches/S2_6/common/base.c
    branches/S2_6/common/borders.c
    branches/S2_6/common/extras.c
    branches/S2_6/common/map.h
    branches/S2_6/common/packets.h
    branches/S2_6/common/road.c
    branches/S2_6/common/scriptcore/api_common_utilities.c
    branches/S2_6/common/scriptcore/api_game_find.c
    branches/S2_6/common/tile.c
    branches/S2_6/server/diplomats.c
    branches/S2_6/server/meta.c
    branches/S2_6/server/srv_log.c
    branches/S2_6/tools/ruledit/rulesave.c

Modified: branches/S2_6/ai/default/ailog.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/ai/default/ailog.c?rev=28854&r1=28853&r2=28854&view=diff
==============================================================================
--- branches/S2_6/ai/default/ailog.c    (original)
+++ branches/S2_6/ai/default/ailog.c    Thu Apr 23 23:07:56 2015
@@ -18,6 +18,7 @@
 #include <stdarg.h>
 
 /* common */
+#include "map.h"
 #include "player.h"
 #include "research.h"
 

Modified: branches/S2_6/ai/default/daieffects.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/ai/default/daieffects.c?rev=28854&r1=28853&r2=28854&view=diff
==============================================================================
--- branches/S2_6/ai/default/daieffects.c       (original)
+++ branches/S2_6/ai/default/daieffects.c       Thu Apr 23 23:07:56 2015
@@ -20,6 +20,7 @@
 #include "effects.h"
 #include "game.h"
 #include "government.h"
+#include "map.h"
 #include "multipliers.h"
 #include "player.h"
 #include "research.h"

Modified: branches/S2_6/common/achievements.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/common/achievements.c?rev=28854&r1=28853&r2=28854&view=diff
==============================================================================
--- branches/S2_6/common/achievements.c (original)
+++ branches/S2_6/common/achievements.c Thu Apr 23 23:07:56 2015
@@ -26,6 +26,7 @@
 #include "city.h"
 #include "culture.h"
 #include "game.h"
+#include "map.h"
 #include "player.h"
 #include "spaceship.h"
 

Modified: branches/S2_6/common/actions.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/common/actions.c?rev=28854&r1=28853&r2=28854&view=diff
==============================================================================
--- branches/S2_6/common/actions.c      (original)
+++ branches/S2_6/common/actions.c      Thu Apr 23 23:07:56 2015
@@ -22,6 +22,7 @@
 #include "actions.h"
 #include "city.h"
 #include "game.h"
+#include "map.h"
 #include "unit.h"
 #include "research.h"
 #include "tile.h"

Modified: branches/S2_6/common/base.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/common/base.c?rev=28854&r1=28853&r2=28854&view=diff
==============================================================================
--- branches/S2_6/common/base.c (original)
+++ branches/S2_6/common/base.c Thu Apr 23 23:07:56 2015
@@ -18,6 +18,7 @@
 /* common */
 #include "extras.h"
 #include "game.h"
+#include "map.h"
 #include "tile.h"
 #include "unit.h"
 

Modified: branches/S2_6/common/borders.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/common/borders.c?rev=28854&r1=28853&r2=28854&view=diff
==============================================================================
--- branches/S2_6/common/borders.c      (original)
+++ branches/S2_6/common/borders.c      Thu Apr 23 23:07:56 2015
@@ -21,6 +21,7 @@
 
 /* common */
 #include "game.h"
+#include "map.h"
 #include "tile.h"
 #include "unit.h"
 

Modified: branches/S2_6/common/extras.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/common/extras.c?rev=28854&r1=28853&r2=28854&view=diff
==============================================================================
--- branches/S2_6/common/extras.c       (original)
+++ branches/S2_6/common/extras.c       Thu Apr 23 23:07:56 2015
@@ -22,6 +22,7 @@
 /* common */
 #include "base.h"
 #include "game.h"
+#include "map.h"
 #include "road.h"
 
 #include "extras.h"

Modified: branches/S2_6/common/map.h
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/common/map.h?rev=28854&r1=28853&r2=28854&view=diff
==============================================================================
--- branches/S2_6/common/map.h  (original)
+++ branches/S2_6/common/map.h  Thu Apr 23 23:07:56 2015
@@ -26,8 +26,8 @@
 
 /* common */
 #include "fc_types.h"
-
 #include "tile.h"
+#include "packets.h"
 
 /****************************************************************
 miscellaneous terrain information

Modified: branches/S2_6/common/packets.h
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/common/packets.h?rev=28854&r1=28853&r2=28854&view=diff
==============================================================================
--- branches/S2_6/common/packets.h      (original)
+++ branches/S2_6/common/packets.h      Thu Apr 23 23:07:56 2015
@@ -25,12 +25,12 @@
 #include "effects.h"
 #include "events.h"
 #include "improvement.h"       /* bv_imprs */
-#include "map.h"
 #include "player.h"
 #include "requirements.h"
 #include "shared.h"            /* MAX_LEN_ADDR */
 #include "spaceship.h"
 #include "team.h"
+#include "tile.h"
 #include "traderoutes.h"
 #include "unittype.h"
 #include "worklist.h"

Modified: branches/S2_6/common/road.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/common/road.c?rev=28854&r1=28853&r2=28854&view=diff
==============================================================================
--- branches/S2_6/common/road.c (original)
+++ branches/S2_6/common/road.c Thu Apr 23 23:07:56 2015
@@ -19,6 +19,7 @@
 #include "extras.h"
 #include "fc_types.h"
 #include "game.h"
+#include "map.h"
 #include "movement.h"
 #include "name_translation.h"
 #include "unittype.h"

Modified: branches/S2_6/common/scriptcore/api_common_utilities.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/common/scriptcore/api_common_utilities.c?rev=28854&r1=28853&r2=28854&view=diff
==============================================================================
--- branches/S2_6/common/scriptcore/api_common_utilities.c      (original)
+++ branches/S2_6/common/scriptcore/api_common_utilities.c      Thu Apr 23 
23:07:56 2015
@@ -17,12 +17,13 @@
 
 #include <math.h>
 
-/* common */
-#include "version.h"
-
 /* utilities */
 #include "log.h"
 #include "rand.h"
+
+/* common */
+#include "map.h"
+#include "version.h"
 
 /* common/scriptcore */
 #include "luascript.h"

Modified: branches/S2_6/common/scriptcore/api_game_find.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/common/scriptcore/api_game_find.c?rev=28854&r1=28853&r2=28854&view=diff
==============================================================================
--- branches/S2_6/common/scriptcore/api_game_find.c     (original)
+++ branches/S2_6/common/scriptcore/api_game_find.c     Thu Apr 23 23:07:56 2015
@@ -17,6 +17,7 @@
 
 /* common */
 #include "idex.h"
+#include "map.h"
 #include "movement.h"
 
 /* common/scriptcore */

Modified: branches/S2_6/common/tile.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/common/tile.c?rev=28854&r1=28853&r2=28854&view=diff
==============================================================================
--- branches/S2_6/common/tile.c (original)
+++ branches/S2_6/common/tile.c Thu Apr 23 23:07:56 2015
@@ -23,6 +23,7 @@
 /* common */
 #include "fc_interface.h"
 #include "game.h"
+#include "map.h"
 #include "movement.h"
 #include "road.h"
 #include "unit.h"

Modified: branches/S2_6/server/diplomats.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/diplomats.c?rev=28854&r1=28853&r2=28854&view=diff
==============================================================================
--- branches/S2_6/server/diplomats.c    (original)
+++ branches/S2_6/server/diplomats.c    Thu Apr 23 23:07:56 2015
@@ -28,6 +28,7 @@
 #include "events.h"
 #include "game.h"
 #include "government.h"
+#include "map.h"
 #include "movement.h"
 #include "player.h"
 #include "research.h"

Modified: branches/S2_6/server/meta.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/meta.c?rev=28854&r1=28853&r2=28854&view=diff
==============================================================================
--- branches/S2_6/server/meta.c (original)
+++ branches/S2_6/server/meta.c Thu Apr 23 23:07:56 2015
@@ -55,6 +55,7 @@
 #include "connection.h"
 #include "dataio.h"
 #include "game.h"
+#include "map.h"
 #include "version.h"
 
 /* server */

Modified: branches/S2_6/server/srv_log.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/srv_log.c?rev=28854&r1=28853&r2=28854&view=diff
==============================================================================
--- branches/S2_6/server/srv_log.c      (original)
+++ branches/S2_6/server/srv_log.c      Thu Apr 23 23:07:56 2015
@@ -28,6 +28,7 @@
 #include "ai.h"
 #include "city.h"
 #include "game.h"
+#include "map.h"
 #include "unit.h"
 
 /* server */

Modified: branches/S2_6/tools/ruledit/rulesave.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/tools/ruledit/rulesave.c?rev=28854&r1=28853&r2=28854&view=diff
==============================================================================
--- branches/S2_6/tools/ruledit/rulesave.c      (original)
+++ branches/S2_6/tools/ruledit/rulesave.c      Thu Apr 23 23:07:56 2015
@@ -23,6 +23,7 @@
 #include "achievements.h"
 #include "game.h"
 #include "government.h"
+#include "map.h"
 #include "movement.h"
 #include "multipliers.h"
 #include "specialist.h"


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

Reply via email to