Minor opengl fixes, still not compiling, look at line 14 in src/graphics/OpenGLGraphics.cpp, build/src/graphics/OpenGLGraphics.cpp:14:15: error: expected primary-expression before '{' token

build/src/graphics/OpenGLGraphics.cpp:14:15: error: expected ')' before '{' token
'

3 files changed, 4 insertions, 7 deletions

diff --git a/src/graphics/OpenGLGraphics.cpp b/src/graphics/OpenGLGraphics.cpp
index b6dbe7f..4167305 100644
--- a/src/graphics/OpenGLGraphics.cpp
+++ b/src/graphics/OpenGLGraphics.cpp
@@ -1,14 +1,15 @@
 #include "Graphics.h"
 #include "font.h"
 #include <pthread.h>
+#ifdef GetUserName
 #undef GetUserName //God dammit microsoft!
-
+#endif
 #ifdef OGLI
 
 static pthread_mutex_t gMutex = PTHREAD_MUTEX_INITIALIZER;
 
 Graphics::Graphics():
-sdl_scale(1)
+	sdl_scale(1)
 {
 	if(gMutex == PTHREAD_MUTEX_INITIALIZER)
 		pthread_mutex_init (&gMutex, NULL);
diff --git a/src/graphics/Renderer.cpp b/src/graphics/Renderer.cpp
index 6c1a31b..c0e0455 100644
--- a/src/graphics/Renderer.cpp
+++ b/src/graphics/Renderer.cpp
@@ -31,9 +31,6 @@ extern "C"
 #define VIDYRES YRES
 #endif
 
-#ifdef OGLR
-#define drawrect(args) g->drawrect(args)
-#endif
 
 void Renderer::RenderBegin()
 {
diff --git a/src/graphics/Renderer.h b/src/graphics/Renderer.h
index cc7debe..606dbc8 100644
--- a/src/graphics/Renderer.h
+++ b/src/graphics/Renderer.h
@@ -85,7 +85,7 @@ public:
 	void checkShader(GLuint shader, char * shname);
 	void checkProgram(GLuint program, char * progname);
 	void loadShaders();
-#else
+#endif
 	pixel * vid;
 	pixel * persistentVid;
 	pixel * warpVid;
@@ -111,7 +111,6 @@ public:
 	void gradientrect(int x, int y, int width, int height, int r, int g, int b, int a, int r2, int g2, int b2, int a2);
 
 	void draw_image(pixel *img, int x, int y, int w, int h, int a);
-#endif
 
 	VideoBuffer DumpFrame();