From b434f0863a7d0ec3f6208e71ba7f397b08cad6d4 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 23 Jun 2016 07:44:56 +0200 Subject: [PATCH] CXX_BUILD buildfix --- gfx/common/egl_common.c | 7 ++++--- gfx/common/egl_common.h | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/gfx/common/egl_common.c b/gfx/common/egl_common.c index 3e8f4c931c..6be7c1cbfa 100644 --- a/gfx/common/egl_common.c +++ b/gfx/common/egl_common.c @@ -190,10 +190,11 @@ void egl_install_sighandlers(void) } bool egl_init_context(egl_ctx_data_t *egl, - NativeDisplayType display, + void *display_data, EGLint *major, EGLint *minor, EGLint *n, const EGLint *attrib_ptr) { + NativeDisplayType display = (NativeDisplayType)display_data; egl->dpy = eglGetDisplay(display); if (!egl->dpy) { @@ -237,9 +238,9 @@ bool egl_create_context(egl_ctx_data_t *egl, const EGLint *egl_attribs) return true; } -bool egl_create_surface(egl_ctx_data_t *egl, NativeWindowType native_window) +bool egl_create_surface(egl_ctx_data_t *egl, void *native_window) { - egl->surf = eglCreateWindowSurface(egl->dpy, egl->config, native_window, NULL); + egl->surf = eglCreateWindowSurface(egl->dpy, egl->config, (NativeWindowType)native_window, NULL); if (egl->surf == EGL_NO_SURFACE) return false; diff --git a/gfx/common/egl_common.h b/gfx/common/egl_common.h index 70d2ef680c..0f153219b3 100644 --- a/gfx/common/egl_common.h +++ b/gfx/common/egl_common.h @@ -86,7 +86,7 @@ void egl_get_video_size(egl_ctx_data_t *egl, unsigned *width, unsigned *height); void egl_install_sighandlers(void); bool egl_init_context(egl_ctx_data_t *egl, - NativeDisplayType display, + void *display_data, EGLint *major, EGLint *minor, EGLint *n, @@ -94,7 +94,7 @@ bool egl_init_context(egl_ctx_data_t *egl, bool egl_create_context(egl_ctx_data_t *egl, const EGLint *egl_attribs); -bool egl_create_surface(egl_ctx_data_t *egl, NativeWindowType native_window); +bool egl_create_surface(egl_ctx_data_t *egl, void *native_window); bool egl_get_native_visual_id(egl_ctx_data_t *egl, EGLint *value);