qf/newtree
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/newtree synced 2025-06-02 10:01:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix a broken fix for sun's model_t type. (got broken during the header audit)

Browse source
This commit is contained in:
Bill Currie 2001-02-08 20:56:40 +00:00
parent 5b2561720e
commit 679b67ddd2
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
source/cl_main.c
View file

@ -29,6 +29,11 @@
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
# include "config.h" # include "config.h"
#endif #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 #ifdef HAVE_STRING_H
# include <string.h> # include <string.h>
#endif #endif
@ -49,6 +54,10 @@
#include <setjmp.h> #include <setjmp.h>
#ifdef __sun
# undef model_t
#endif
#include "bothdefs.h" #include "bothdefs.h"
#include "buildnum.h" #include "buildnum.h"
#include "cdaudio.h" #include "cdaudio.h"
@ -87,15 +96,6 @@
#include "view.h" #include "view.h"
#include "va.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 (); void CL_RemoveQFInfoKeys ();
// we need to declare some mouse variables here, because the menu system // we need to declare some mouse variables here, because the menu system