mesa/include/GL
Vinson Lee c10dcb2ce8 Revert "mesa_glinterop: remove inclusion of GLX header"
This reverts commit 8472045b16.

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: 8472045b16 ("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>
2016-10-10 15:09:44 -07:00
..
internal dri: add offset attribute and bump version of EGLImage extensions. 2016-09-21 12:19:19 +01:00
gl_mangle.h mesa: regenerate gl_mangle.h 2014-08-12 08:09:45 -06:00
gl.h mesa: remove unused #pragma export on/off lines 2014-04-28 17:16:42 -06:00
glcorearb.h GL: update glcorearb.h to svn 32433 2016-06-10 20:31:53 -04:00
glext.h Update Khronos-supplied headers to r33100 2016-08-28 21:41:47 -04:00
glx_mangle.h mesa: remove outdated version lines in comments 2013-06-05 08:54:27 -06:00
glx.h includes/GL: remove duplicated extension declarations from glx.h 2015-08-01 15:47:55 +01:00
glxext.h Update Khronos-supplied headers to r33100 2016-08-28 21:41:47 -04:00
mesa_glinterop.h Revert "mesa_glinterop: remove inclusion of GLX header" 2016-10-10 15:09:44 -07:00
osmesa.h osmesa: add new OSMesaCreateContextAttribs function 2015-12-16 19:38:51 -07:00
wglext.h Update Khronos-supplied headers to r33100 2016-08-28 21:41:47 -04:00