empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Break inclusion cycle: prototypes.h and commands.h included each

Browse source 
other.  Ensure headers in include/ can be included in any order
(except for econfig-spec.h, which is special).  New header types.h to
help avoid inclusion cycles.  Sort include directives.  Remove some
superflous includes.
This commit is contained in:
Markus Armbruster 2006-07-10 06:37:23 +00:00
parent 16a0869bb0
commit e42053d928
373 changed files with 1193 additions and 2516 deletions
Download patch file Download diff file Expand all files Collapse all files

6
include/combat.h
View file

@ -34,8 +34,8 @@
#ifndef COMBAT_H
#define COMBAT_H
#include "sect.h"
#include "queue.h"
#include "types.h"
#include "ship.h"
struct combat {
int type; /* EF_BAD, EF_SECTOR, EF_SHIP, or EF_PLANE */
@ -56,7 +56,7 @@ struct combat {
struct dchrstr *sct_dcp;
struct mchrstr *shp_mcp;
struct lchrstr *lnd_lcp;
char shp_name[MAXSHPNAMLEN];
char shp_name[MAXSHPNAMLEN]; /* FIXME huh? pulls in ship.h */
int relations_checked;
};