From d8dc34b199e7cf37ec87048905a08fd10800f0cb Mon Sep 17 00:00:00 2001
From: laurentgom <laurentgom@4e206d99-4929-0410-ac5d-dfc041789085>
Date: Sun, 31 May 2009 11:53:28 +0000
Subject: [PATCH] Fixed Linux implementation of ContextGL and ThreadLocalImpl

git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1117 4e206d99-4929-0410-ac5d-dfc041789085
---
 src/SFML/System/Unix/ThreadLocalImpl.cpp | 2 +-
 src/SFML/Window/Linux/ContextGLX.hpp     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/SFML/System/Unix/ThreadLocalImpl.cpp b/src/SFML/System/Unix/ThreadLocalImpl.cpp
index f5395963..9d4091bd 100644
--- a/src/SFML/System/Unix/ThreadLocalImpl.cpp
+++ b/src/SFML/System/Unix/ThreadLocalImpl.cpp
@@ -25,7 +25,7 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/System/Win32/ThreadLocalImpl.hpp>
+#include <SFML/System/Unix/ThreadLocalImpl.hpp>
 
 
 namespace sf
diff --git a/src/SFML/Window/Linux/ContextGLX.hpp b/src/SFML/Window/Linux/ContextGLX.hpp
index 94f680b1..d4140c7e 100644
--- a/src/SFML/Window/Linux/ContextGLX.hpp
+++ b/src/SFML/Window/Linux/ContextGLX.hpp
@@ -28,7 +28,7 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/Window/Context.hpp>
+#include <SFML/Window/ContextGL.hpp>
 #include <SFML/Window/Linux/DisplayRef.hpp>
 #include <X11/Xlib.h>
 #include <GL/glx.h>
@@ -41,7 +41,7 @@ namespace priv
 ////////////////////////////////////////////////////////////
 /// Linux (GLX) implementation of OpenGL contexts
 ////////////////////////////////////////////////////////////
-class ContextGLX : public Context
+class ContextGLX : public ContextGL
 {
 public :