[Mesa-dev] [PATCH] Revert "mesa_glinterop: remove inclusion of GLX header"

[Emil Velikov]

On 12 October 2016 at 18:47, Chih-Wei Huang <cwhuang at android-x86.org> wrote:
> 2016-10-04 7:03 GMT+08:00 Vinson Lee <vlee at freedesktop.org>:
>> 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 at freedesktop.org>
>> ---
>>  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 383d7f9..c6a967e 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;
>> --
>
> NACK.
> The patch breaks Android build (at least).
Pretty much what I said before the patch made it to the list. Still ...

Yet again, props to you I found out that I never got to sending out a
better fix. Should be in your inbox in a second, so if you can give it
a try that'll be great.

-Emil