mirror of
https://git.code.sf.net/p/quake/quakeforge
synced 2025-04-25 02:52:06 +00:00
damn sun's model_t :P
This commit is contained in:
parent
4f65a313fd
commit
63909922d7
1 changed files with 9 additions and 0 deletions
|
@ -27,6 +27,11 @@
|
||||||
static const char rcsid[] =
|
static const char rcsid[] =
|
||||||
"$Id$";
|
"$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
|
#ifdef HAVE_CONFIG_H
|
||||||
# include "config.h"
|
# include "config.h"
|
||||||
#endif
|
#endif
|
||||||
|
@ -57,6 +62,10 @@ static const char rcsid[] =
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <setjmp.h>
|
#include <setjmp.h>
|
||||||
|
|
||||||
|
#ifdef __sun
|
||||||
|
# undef model_t // allow qf to use it's model_t
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "QF/cmd.h"
|
#include "QF/cmd.h"
|
||||||
#include "QF/console.h"
|
#include "QF/console.h"
|
||||||
#include "QF/cvar.h"
|
#include "QF/cvar.h"
|
||||||
|
|
Loading…
Reference in a new issue