From c10dcb2ce837922c6ee4e191e6d6202098a5ee10 Mon Sep 17 00:00:00 2001 From: Vinson Lee Date: Mon, 3 Oct 2016 15:16:30 -0700 Subject: [PATCH] Revert "mesa_glinterop: remove inclusion of GLX header" MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This reverts commit 8472045b16b3e4621553fe451a20a9ba9f0d44b6. Conflicts: include/GL/mesa_glinterop.h This patch fixes this build error with GCC 4.4. Compiling src/glx/dri_common_interop.c ... In file included from src/glx/dri_common_interop.c:33: include/GL/mesa_glinterop.h:62: error: redefinition of typedef ‘GLXContext’ include/GL/glx.h:165: note: previous declaration of ‘GLXContext’ was here Fixes: 8472045b16b3 ("mesa_glinterop: remove inclusion of GLX header") Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=96770 Signed-off-by: Vinson Lee --- include/GL/mesa_glinterop.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/include/GL/mesa_glinterop.h b/include/GL/mesa_glinterop.h index 383d7f91aa8..c6a967ea8ec 100644 --- a/include/GL/mesa_glinterop.h +++ b/include/GL/mesa_glinterop.h @@ -52,15 +52,12 @@ #include #include +#include #ifdef __cplusplus extern "C" { #endif -/* Forward declarations to avoid inclusion of GL/glx.h */ -typedef struct _XDisplay Display; -typedef struct __GLXcontextRec *GLXContext; - /* Forward declarations to avoid inclusion of EGL/egl.h */ typedef void *EGLDisplay; typedef void *EGLContext; -- 2.30.2