OSDN Git Service

Revert "mesa_glinterop: remove inclusion of GLX header"
authorVinson Lee <vlee@freedesktop.org>
Mon, 3 Oct 2016 22:16:30 +0000 (15:16 -0700)
committerVinson Lee <vlee@freedesktop.org>
Mon, 10 Oct 2016 22:09:44 +0000 (15:09 -0700)
commitc10dcb2ce837922c6ee4e191e6d6202098a5ee10
tree6eaee477430016f840e0c7c09f169c93683eded1
parenteef0744d4384a48c70da3f9863a02ceab08c97bb
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>
include/GL/mesa_glinterop.h