diff options
| author | Vinson Lee <vlee@freedesktop.org> | 2016-10-03 15:16:30 -0700 |
|---|---|---|
| committer | Vinson Lee <vlee@freedesktop.org> | 2016-10-10 15:09:44 -0700 |
| commit | c10dcb2ce837922c6ee4e191e6d6202098a5ee10 (patch) | |
| tree | 6eaee477430016f840e0c7c09f169c93683eded1 /include | |
| parent | eef0744d4384a48c70da3f9863a02ceab08c97bb (diff) | |
Revert "mesa_glinterop: remove inclusion of GLX header"
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 <vlee@freedesktop.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/GL/mesa_glinterop.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/include/GL/mesa_glinterop.h b/include/GL/mesa_glinterop.h index 383d7f91aa..c6a967ea8e 100644 --- a/include/GL/mesa_glinterop.h +++ b/include/GL/mesa_glinterop.h @@ -52,15 +52,12 @@ #include <stddef.h> #include <stdint.h> +#include <GL/glx.h> #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; |