From 1dfafc21da6568d505dbf708988652251d511c95 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Mon, 14 Jun 2004 23:59:14 +0000
Subject: [PATCH] cleanup

---
 stepmania/src/RageDisplay_OGL.cpp | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/stepmania/src/RageDisplay_OGL.cpp b/stepmania/src/RageDisplay_OGL.cpp
index 7ddcdfe01b..f6b053099d 100644
--- a/stepmania/src/RageDisplay_OGL.cpp
+++ b/stepmania/src/RageDisplay_OGL.cpp
@@ -324,12 +324,7 @@ static void TurnOffHardwareVBO()
 	}
 }
 
-
-#if defined(__unix__) && !defined(unix)
-#define unix
-#endif
-
-#if defined(unix)
+#if defined(UNIX)
 #define Font X11___Font
 #define Screen X11___Screen
 #include "GL/glx.h"
@@ -337,13 +332,13 @@ static void TurnOffHardwareVBO()
 #undef Screen
 #endif
 
-#if defined(unix)
+#if defined(UNIX)
 Display *g_X11Display = NULL;
 #endif
 
 static void LogGLXDebugInformation()
 {
-#if defined(unix)
+#if defined(UNIX)
 	ASSERT( g_X11Display );
 
 	const int scr = DefaultScreen( g_X11Display );
@@ -415,7 +410,7 @@ RageDisplay_OGL::RageDisplay_OGL( VideoModeParams p, bool bAllowUnacceleratedRen
 	}
 #endif
 
-#if defined(unix)
+#if defined(UNIX)
 	if( !glXIsDirect( g_X11Display, glXGetCurrentContext() ) )
 	{
 		if( !bAllowUnacceleratedRenderer )
@@ -437,7 +432,7 @@ RageDisplay_OGL::RageDisplay_OGL( VideoModeParams p, bool bAllowUnacceleratedRen
 	glGetFloatv(GL_POINT_SIZE_GRANULARITY, &g_point_granularity);
 }
 
-#if defined(unix) && defined(HAVE_LIBXTST)
+#if defined(UNIX) && defined(HAVE_LIBXTST)
 #include <X11/extensions/XTest.h>
 #endif
 
@@ -448,7 +443,7 @@ void RageDisplay_OGL::Update(float fDeltaTime)
 	if( PREFSMAN->m_bDisableScreenSaver )
 	{
 		/* Disable the screensaver. */
-#if defined(unix) && defined(HAVE_LIBXTST)
+#if defined(UNIX) && defined(HAVE_LIBXTST)
 		ASSERT( g_X11Display );
 
 		/* This causes flicker. */