qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-10 15:22:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix model_t issues for solaris (now that I know which headers cause the

Browse source 
problem...:)
This commit is contained in:
Bill Currie 2002-08-09 02:44:23 +00:00
parent 1354975692
commit b5783866ad
7 changed files with 17 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nq/source/net_udp.c
View file

@ -41,7 +41,9 @@ static const char rcsid[] =
# include <sys/socket.h>
#endif
#ifdef HAVE_NETINET_IN_H
# define model_t sun_model_t
# include <netinet/in.h>
# undef model_t
#endif
#ifdef HAVE_ARPA_INET_H
# include <arpa/inet.h>

11
qw/source/cl_main.c
View file

@ -27,11 +27,6 @@
static const char rcsid[] =
"$Id$";
#ifdef __sun
/* Sun's model_t in sys/model.h conflicts w/ Quake's model_t */
# define model_t sunmodel_t
#endif
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
@ -43,7 +38,9 @@ static const char rcsid[] =
# include <strings.h>
#endif
#ifdef HAVE_NETINET_IN_H
# define model_t sun_model_t
# include <netinet/in.h>
# undef model_t
#endif
#ifdef HAVE_UNISTD_H
# include <unistd.h>
@ -59,10 +56,6 @@ static const char rcsid[] =
#include <errno.h>
#include <setjmp.h>
#ifdef __sun
# undef model_t // allow qf to use it's model_t
#endif
#include "QF/cbuf.h"
#include "QF/idparse.h"
#include "QF/cdaudio.h"

12
qw/source/cl_slist.c
View file

@ -35,14 +35,11 @@ static const char rcsid[] =
# 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
# define model_t sun_model_t
# include <netinet/in.h>
# undef model_t
#endif
#ifdef HAVE_STRING_H
# include <string.h>
@ -66,11 +63,6 @@ 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"

2
qw/source/master.c
View file

@ -42,7 +42,9 @@ static const char rcsid[] =
# include <sys/socket.h>
#endif
#ifdef HAVE_NETINET_IN_H
# define model_t sun_model_t
# include <netinet/in.h>
# undef model_t
#endif
#ifdef HAVE_ARPA_INET_H
# include <arpa/inet.h>

2
qw/source/net_udp.c
View file

@ -44,7 +44,9 @@ static const char rcsid[] =
# include <sys/socket.h>
#endif
#ifdef HAVE_NETINET_IN_H
# define model_t sun_model_t
# include <netinet/in.h>
# undef model_t
#endif
#ifdef HAVE_NETDB_H
# include <netdb.h>

2
qw/source/net_udp6.c
View file

@ -52,7 +52,9 @@ static const char rcsid[] =
# include <sys/socket.h>
#endif
#ifdef HAVE_NETINET_IN_H
# define model_t sun_model_t
# include <netinet/in.h>
# undef model_t
#endif
#ifdef HAVE_NETDB_H
# include <netdb.h>

17
qw/source/sv_main.c
View file

@ -27,11 +27,6 @@
static const char rcsid[] =
"$Id$";
#ifdef __sun
/* Sun's model_t in sys/model.h conflicts w/ Quake's model_t */
# define model_t sunmodel_t
#endif
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
@ -44,12 +39,14 @@ static const char rcsid[] =
#ifdef HAVE_SYS_TYPES_H
# include <sys/types.h>
#endif
#ifdef HAVE_SYS_SOCKET_H
# include <sys/socket.h>
#endif
#ifdef HAVE_NETINET_IN_H
# define INET6
# define model_t sun_model_t
# include <netinet/in.h>
# undef model_t
#endif
#ifdef HAVE_SYS_SOCKET_H
# include <sys/socket.h>
#endif
#ifdef HAVE_ARPA_INET_H
# include <arpa/inet.h>
@ -62,10 +59,6 @@ static const char rcsid[] =
#include <stdlib.h>
#include <setjmp.h>
#ifdef __sun
# undef model_t // allow qf to use it's model_t
#endif
#include "QF/cbuf.h"
#include "QF/idparse.h"
#include "QF/gib_parse.h"