summaryrefslogtreecommitdiff
path: root/src/graphics/OpenGLGraphics.cpp
diff options
context:
space:
mode:
authorBryan Hoyle <starfoxprime@gmail.com>2012-08-12 15:38:26 (GMT)
committer Bryan Hoyle <starfoxprime@gmail.com>2012-08-12 15:38:26 (GMT)
commit07821d9c858ea8fe467b0672b0c9d11552bfe8da (patch)
treeb1b27fd1eaa92050c5e5c1545d702a22f5fd0876 /src/graphics/OpenGLGraphics.cpp
parentf1fc3811aa68f547688ac53c67ba1f5e1e92f161 (diff)
downloadpowder-07821d9c858ea8fe467b0672b0c9d11552bfe8da.zip
powder-07821d9c858ea8fe467b0672b0c9d11552bfe8da.tar.gz
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 '
Diffstat (limited to 'src/graphics/OpenGLGraphics.cpp')
-rw-r--r--src/graphics/OpenGLGraphics.cpp5
1 files changed, 3 insertions, 2 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);