model_t fix for Sun was broken - re-fixed

This commit is contained in:
Loring Holden 2000-06-14 13:58:00 +00:00
parent 95a8c7e466
commit 35e0293824

View file

@ -52,6 +52,11 @@
#include <netinet/in.h> #include <netinet/in.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
#include <quakedef.h> #include <quakedef.h>
#include <winquake.h> #include <winquake.h>
#ifdef QUAKEWORLD #ifdef QUAKEWORLD
@ -85,11 +90,6 @@
#ifdef QUAKEWORLD #ifdef QUAKEWORLD
#include <cl_slist.h> #include <cl_slist.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 __sun #ifdef __sun
#undef model_t #undef model_t
#endif #endif