[PATCH weston 1/4] gl: fix fallback definition of EGL_DEFAULT_DISPLAY

ppaalanen at gmail.com ppaalanen at gmail.com
Wed Dec 4 05:34:45 PST 2013


From: Pekka Paalanen <pekka.paalanen at collabora.co.uk>

Compiling fbdev backend on RaspberryPi caused the following warning:

compositor-fbdev.c: In function 'fbdev_compositor_create':
compositor-fbdev.c:929:6: warning: passing argument 2 of
'gl_renderer->create' makes integer from pointer without a cast [enabled
by default]
compositor-fbdev.c:929:6: note: expected 'EGLNativeDisplayType' but
argument is of type 'void *'

Fix the definition of EGL_DEFAULT_DISPLAY to match the definition in
EGL/egl.h (of Mesa).

Signed-off-by: Pekka Paalanen <pekka.paalanen at collabora.co.uk>
---
 src/gl-renderer.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gl-renderer.h b/src/gl-renderer.h
index 63b371c..dcdf69d 100644
--- a/src/gl-renderer.h
+++ b/src/gl-renderer.h
@@ -35,7 +35,7 @@ typedef void *EGLDisplay;
 typedef void *EGLSurface;
 typedef intptr_t EGLNativeDisplayType;
 typedef intptr_t EGLNativeWindowType;
-#define EGL_DEFAULT_DISPLAY NULL
+#define EGL_DEFAULT_DISPLAY ((EGLNativeDisplayType)0)
 
 #endif
 
-- 
1.8.3.2



More information about the wayland-devel mailing list