mirror of
https://git.code.sf.net/p/quake/newtree
synced 2024-11-21 19:51:18 +00:00
fix a broken fix for sun's model_t type. (got broken during the header audit)
This commit is contained in:
parent
5b2561720e
commit
679b67ddd2
1 changed files with 9 additions and 9 deletions
|
@ -29,6 +29,11 @@
|
|||
#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
|
||||
#ifdef HAVE_STRING_H
|
||||
# include <string.h>
|
||||
#endif
|
||||
|
@ -49,6 +54,10 @@
|
|||
|
||||
#include <setjmp.h>
|
||||
|
||||
#ifdef __sun
|
||||
# undef model_t
|
||||
#endif
|
||||
|
||||
#include "bothdefs.h"
|
||||
#include "buildnum.h"
|
||||
#include "cdaudio.h"
|
||||
|
@ -87,15 +96,6 @@
|
|||
#include "view.h"
|
||||
#include "va.h"
|
||||
|
||||
#ifdef __sun
|
||||
/* Sun's model_t in sys/model.h conflicts w/ Quake's model_t */
|
||||
# define model_t sunmodel_t
|
||||
#endif
|
||||
|
||||
#ifdef __sun
|
||||
# undef model_t
|
||||
#endif
|
||||
|
||||
void CL_RemoveQFInfoKeys ();
|
||||
|
||||
// we need to declare some mouse variables here, because the menu system
|
||||
|
|
Loading…
Reference in a new issue