Merge pull request #60 from Cloudef/EGL

Explicitly cast default EGL display.
This commit is contained in:
Camilla Berglund 2013-06-19 03:09:07 -07:00
commit 96259004be

View File

@ -210,7 +210,7 @@ static GLboolean chooseFBConfigs(const _GLFWwndconfig* wndconfig,
// //
int _glfwInitContextAPI(void) int _glfwInitContextAPI(void)
{ {
_glfw.egl.display = eglGetDisplay(_GLFW_EGL_NATIVE_DISPLAY); _glfw.egl.display = eglGetDisplay((EGLNativeDisplayType)_GLFW_EGL_NATIVE_DISPLAY);
if (_glfw.egl.display == EGL_NO_DISPLAY) if (_glfw.egl.display == EGL_NO_DISPLAY)
{ {
_glfwInputError(GLFW_API_UNAVAILABLE, _glfwInputError(GLFW_API_UNAVAILABLE,
@ -464,7 +464,7 @@ void _glfwPlatformMakeContextCurrent(_GLFWwindow* window)
{ {
window->egl.surface = eglCreateWindowSurface(_glfw.egl.display, window->egl.surface = eglCreateWindowSurface(_glfw.egl.display,
window->egl.config, window->egl.config,
_GLFW_EGL_NATIVE_WINDOW, (EGLNativeWindowType)_GLFW_EGL_NATIVE_WINDOW,
NULL); NULL);
if (window->egl.surface == EGL_NO_SURFACE) if (window->egl.surface == EGL_NO_SURFACE)
{ {