From 679b67ddd2dbbe343f4865c04c91dc7e932680c3 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 8 Feb 2001 20:56:40 +0000
Subject: [PATCH] fix a broken fix for sun's model_t type. (got broken during
 the header audit)

---
 source/cl_main.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/source/cl_main.c b/source/cl_main.c
index 0c608fe..930b420 100644
--- a/source/cl_main.c
+++ b/source/cl_main.c
@@ -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