From 2991f4071e50cca641044376dc2196d9dcfff80d Mon Sep 17 00:00:00 2001
From: Magnus Auvinen <magnus.auvinen@gmail.com>
Date: Tue, 3 Jan 2012 22:01:37 +0100
Subject: fixed kicking of command buffer if it's full when rendering. fixed
 compile error on windows

---
 src/engine/client/client.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/engine/client/client.cpp')

diff --git a/src/engine/client/client.cpp b/src/engine/client/client.cpp
index 5067f8b2..f126a09c 100644
--- a/src/engine/client/client.cpp
+++ b/src/engine/client/client.cpp
@@ -49,6 +49,10 @@
 	#include <windows.h>
 #endif
 
+#include "SDL.h"
+#ifdef main
+#undef main
+#endif
 
 void CGraph::Init(float Min, float Max)
 {
@@ -1690,8 +1694,6 @@ void CClient::InitInterfaces()
 	m_Friends.Init();
 }
 
-#include "SDL.h"
-
 void CClient::Run()
 {
 	m_LocalStartTime = time_get();
-- 
cgit 1.4.1