Merge pull request #2977 from smspillaz/fix-14501

Include guilib/GraphicContext.h and don't assign NULL to int
xbmc · Jul 16, 2013 · a339cc5 · a339cc5
2 parents c48448b + 0a45e14
commit a339cc5
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/xbmc/windowing/X11/WinSystemX11GLES.cpp b/xbmc/windowing/X11/WinSystemX11GLES.cpp
@@ -28,6 +28,7 @@
 #include "settings/DisplaySettings.h"
 #include "settings/Settings.h"
 #include "settings/DisplaySettings.h"
+#include "guilib/GraphicContext.h"
 #include "guilib/Texture.h"
 #include "windowing/X11/XRandR.h"
 #include <vector>
@@ -84,8 +85,8 @@ CWinSystemX11GLES::CWinSystemX11GLES() : CWinSystemBase()
   m_eglDisplay = NULL;
   m_eglContext = NULL;
   m_eglSurface = NULL;
-  m_eglWindow  = NULL;
+  m_eglWindow  = None;
-  m_wmWindow   = NULL;
+  m_wmWindow   = None;
   m_dpy        = NULL;
 
   m_iVSyncErrors = 0;