From 7b2310834d83198fc88b5a5fb062cb1c9ee19ead Mon Sep 17 00:00:00 2001 From: Zhigang Gong Date: Tue, 22 Nov 2011 18:28:10 +0800 Subject: [PATCH] Added a missed header file. Pointed by Chris, we must add xorg-server.h at the top of each file before we include any other xorg header files. Otherwise, it may cause incorrect XID length. This commit also fixes one compilation warning in X86_64 platform. Signed-off-by: Zhigang Gong --- glamor/glamor_egl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/glamor/glamor_egl.c b/glamor/glamor_egl.c index 9e4804ab4..a068e39a6 100644 --- a/glamor/glamor_egl.c +++ b/glamor/glamor_egl.c @@ -30,6 +30,7 @@ #ifdef HAVE_DIX_CONFIG_H #include #endif +#include #include #include #include @@ -129,7 +130,7 @@ _glamor_egl_create_image(struct glamor_egl_screen_private *glamor_egl, image = glamor_egl->egl_create_image_khr(glamor_egl->display, glamor_egl->context, EGL_DRM_BUFFER_MESA, - (void *) name, attribs); + (void *) (uintptr_t)name, attribs); if (image == EGL_NO_IMAGE_KHR) return EGL_NO_IMAGE_KHR;