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

29
src/lib/player/accept.c
View file

@ -34,27 +34,13 @@
#include <config.h>
#if defined(_WIN32)
#ifdef _WIN32
#define WIN32
#include <winsock2.h>
#undef NS_ALL
#endif
#include "prototypes.h"
#include "misc.h"
#include "proto.h"
#include "empthread.h"
#include "player.h"
#include "file.h"
#include "empio.h"
#include "power.h"
#include "gen.h"
#include "optlist.h"
#if !defined(_WIN32)
#else
#include <arpa/inet.h>
#include <sys/socket.h>
#include <sys/time.h>
#include <netdb.h>
#include <netinet/in.h>
#include <sys/ioctl.h>
@ -63,9 +49,18 @@
#include <signal.h>
#include <errno.h>
#include <fcntl.h>
#include <stdlib.h>
#include <stdio.h>
#include "empio.h"
#include "empthread.h"
#include "file.h"
#include "misc.h"
#include "optlist.h"
#include "player.h"
#include "power.h"
#include "proto.h"
#include "prototypes.h"
static struct emp_qelem Players;
static int player_socket;
static size_t player_addrlen;