Author: sveinung
Date: Thu Jan 15 13:59:35 2015
New Revision: 27694

URL: http://svn.gna.org/viewcvs/freeciv?rev=27694&view=rev
Log:
Clean up includes in requirements.h

tech.h, terrain.h and unittype.h aren't used in requirements.h. Remove them.
Include them directly where they are needed but used to be included via
requirements.h.

See patch #5711

Modified:
    trunk/ai/default/aidata.h
    trunk/common/extras.h
    trunk/common/requirements.h

Modified: trunk/ai/default/aidata.h
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/ai/default/aidata.h?rev=27694&r1=27693&r2=27694&view=diff
==============================================================================
--- trunk/ai/default/aidata.h   (original)
+++ trunk/ai/default/aidata.h   Thu Jan 15 13:59:35 2015
@@ -18,6 +18,7 @@
 
 /* common */
 #include "fc_types.h"
+#include "tech.h"
 
 /* server/advisors */
 #include "advtools.h"

Modified: trunk/common/extras.h
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/common/extras.h?rev=27694&r1=27693&r2=27694&view=diff
==============================================================================
--- trunk/common/extras.h       (original)
+++ trunk/common/extras.h       Thu Jan 15 13:59:35 2015
@@ -21,6 +21,7 @@
 #include "base.h"
 #include "fc_types.h"
 #include "road.h"
+#include "terrain.h"
 
 /* Used in the network protocol. */
 #define SPECENUM_NAME extra_flag_id

Modified: trunk/common/requirements.h
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/common/requirements.h?rev=27694&r1=27693&r2=27694&view=diff
==============================================================================
--- trunk/common/requirements.h (original)
+++ trunk/common/requirements.h Thu Jan 15 13:59:35 2015
@@ -18,11 +18,8 @@
 extern "C" {
 #endif /* __cplusplus */
 
+/* common */
 #include "fc_types.h"
-
-#include "tech.h"
-#include "terrain.h"
-#include "unittype.h"
 
 /* Range of requirements.
  * Used in the network protocol.


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

Reply via email to