mirror of
https://git.code.sf.net/p/quake/quakeforge
synced 2025-01-18 06:51:47 +00:00
clean out some unneeded includes and fix up model_t for sun (again:P)
This commit is contained in:
parent
0eab1e6837
commit
1354975692
4 changed files with 11 additions and 9 deletions
|
@ -53,11 +53,7 @@ static const char rcsid[] =
|
|||
#include <stdlib.h>
|
||||
|
||||
#ifndef _WIN32
|
||||
# include <sys/types.h>
|
||||
# include <sys/mman.h>
|
||||
# include <ctype.h>
|
||||
# include <signal.h>
|
||||
# include <stdarg.h>
|
||||
#endif
|
||||
|
||||
#include <SDL.h>
|
||||
|
|
|
@ -54,7 +54,6 @@ static const char rcsid[] =
|
|||
#include <sys/shm.h>
|
||||
#include <sys/stat.h>
|
||||
#include <sys/time.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/wait.h>
|
||||
|
||||
#include "QF/cvar.h"
|
||||
|
|
|
@ -34,6 +34,12 @@ static const char rcsid[] =
|
|||
#ifdef HAVE_CONFIG_H
|
||||
# include "config.h"
|
||||
#endif
|
||||
|
||||
#ifdef __sun
|
||||
/* Sun's model_t in sys/model.h conflicts w/ Quake's model_t */
|
||||
# define model_t sunmodel_t
|
||||
#endif
|
||||
|
||||
#include <sys/types.h>
|
||||
#ifdef HAVE_NETINET_IN_H
|
||||
# include <netinet/in.h>
|
||||
|
@ -60,6 +66,11 @@ static const char rcsid[] =
|
|||
#include <ctype.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#ifdef __sun
|
||||
# undef model_t // allow qf to use it's model_t
|
||||
#endif
|
||||
|
||||
|
||||
#include "QF/cmd.h"
|
||||
#include "QF/console.h"
|
||||
#include "QF/cvar.h"
|
||||
|
|
|
@ -53,11 +53,7 @@ static const char rcsid[] =
|
|||
#include <stdlib.h>
|
||||
|
||||
#ifndef _WIN32
|
||||
# include <sys/types.h>
|
||||
# include <sys/mman.h>
|
||||
# include <ctype.h>
|
||||
# include <signal.h>
|
||||
# include <stdarg.h>
|
||||
#endif
|
||||
|
||||
#include <SDL.h>
|
||||
|
|
Loading…
Reference in a new issue