mesa_glinterop: remove mesa_glinterop typedefs

As is there are two places that do the typedefs - dri_interface.h and
this header. As we cannot include the former in here, just drop the
typedefs and use the struct directly (as needed).

This is required because typedef redefinition is C11 feature which is
not supported on all the versions of GCC used to build mesa.

v2: Kill the typedef alltogether, as per Marek.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=96236
Cc: Vinson Lee <vlee@freedesktop.org>
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>

5 files changed, 21 insertions, 21 deletions

diff --git a/src/glx/dri2_priv.h b/src/glx/dri2_priv.h
index edba31e8fe..30ab2cdd87 100644
--- a/src/glx/dri2_priv.h
+++ b/src/glx/dri2_priv.h
@@ -72,12 +72,12 @@ dri2_query_renderer_string(struct glx_screen *base, int attribute,
 
 _X_HIDDEN int
 dri2_interop_query_device_info(struct glx_context *ctx,
-                               mesa_glinterop_device_info *out);
+                               struct mesa_glinterop_device_info *out);
 
 _X_HIDDEN int
 dri2_interop_export_object(struct glx_context *ctx,
-                           mesa_glinterop_export_in *in,
-                           mesa_glinterop_export_out *out);
+                           struct mesa_glinterop_export_in *in,
+                           struct mesa_glinterop_export_out *out);
 
 #ifdef __cplusplus
 }
diff --git a/src/glx/dri3_priv.h b/src/glx/dri3_priv.h
index 86ad17c4a5..082237781c 100644
--- a/src/glx/dri3_priv.h
+++ b/src/glx/dri3_priv.h
@@ -135,9 +135,9 @@ dri3_query_renderer_string(struct glx_screen *base, int attribute,
 
 _X_HIDDEN int
 dri3_interop_query_device_info(struct glx_context *ctx,
-                               mesa_glinterop_device_info *out);
+                               struct mesa_glinterop_device_info *out);
 
 _X_HIDDEN int
 dri3_interop_export_object(struct glx_context *ctx,
-                           mesa_glinterop_export_in *in,
-                           mesa_glinterop_export_out *out);
+                           struct mesa_glinterop_export_in *in,
+                           struct mesa_glinterop_export_out *out);
diff --git a/src/glx/dri_common_interop.c b/src/glx/dri_common_interop.c
index 215aac4676..85538c6359 100644
--- a/src/glx/dri_common_interop.c
+++ b/src/glx/dri_common_interop.c
@@ -34,7 +34,7 @@
 
 _X_HIDDEN int
 dri2_interop_query_device_info(struct glx_context *ctx,
-                               mesa_glinterop_device_info *out)
+                               struct mesa_glinterop_device_info *out)
 {
    struct dri2_screen *psc = (struct dri2_screen*)ctx->psc;
    struct dri2_context *drictx = (struct dri2_context*)ctx;
@@ -47,8 +47,8 @@ dri2_interop_query_device_info(struct glx_context *ctx,
 
 _X_HIDDEN int
 dri2_interop_export_object(struct glx_context *ctx,
-                           mesa_glinterop_export_in *in,
-                           mesa_glinterop_export_out *out)
+                           struct mesa_glinterop_export_in *in,
+                           struct mesa_glinterop_export_out *out)
 {
    struct dri2_screen *psc = (struct dri2_screen*)ctx->psc;
    struct dri2_context *drictx = (struct dri2_context*)ctx;
@@ -63,7 +63,7 @@ dri2_interop_export_object(struct glx_context *ctx,
 
 _X_HIDDEN int
 dri3_interop_query_device_info(struct glx_context *ctx,
-                               mesa_glinterop_device_info *out)
+                               struct mesa_glinterop_device_info *out)
 {
    struct dri3_screen *psc = (struct dri3_screen*)ctx->psc;
    struct dri3_context *drictx = (struct dri3_context*)ctx;
@@ -76,8 +76,8 @@ dri3_interop_query_device_info(struct glx_context *ctx,
 
 _X_HIDDEN int
 dri3_interop_export_object(struct glx_context *ctx,
-                           mesa_glinterop_export_in *in,
-                           mesa_glinterop_export_out *out)
+                           struct mesa_glinterop_export_in *in,
+                           struct mesa_glinterop_export_out *out)
 {
    struct dri3_screen *psc = (struct dri3_screen*)ctx->psc;
    struct dri3_context *drictx = (struct dri3_context*)ctx;
diff --git a/src/glx/glxclient.h b/src/glx/glxclient.h
index 7ffd4842e0..ed57a29680 100644
--- a/src/glx/glxclient.h
+++ b/src/glx/glxclient.h
@@ -218,9 +218,9 @@ typedef struct __GLXattributeMachineRec
    __GLXattribute **stackPointer;
 } __GLXattributeMachine;
 
-typedef struct _mesa_glinterop_device_info mesa_glinterop_device_info;
-typedef struct _mesa_glinterop_export_in mesa_glinterop_export_in;
-typedef struct _mesa_glinterop_export_out mesa_glinterop_export_out;
+struct mesa_glinterop_device_info;
+struct mesa_glinterop_export_in;
+struct mesa_glinterop_export_out;
 
 struct glx_context_vtable {
    void (*destroy)(struct glx_context *ctx);
@@ -237,10 +237,10 @@ struct glx_context_vtable {
    void (*release_tex_image)(Display * dpy, GLXDrawable drawable, int buffer);
    void * (*get_proc_address)(const char *symbol);
    int (*interop_query_device_info)(struct glx_context *ctx,
-                                    mesa_glinterop_device_info *out);
+                                    struct mesa_glinterop_device_info *out);
    int (*interop_export_object)(struct glx_context *ctx,
-                                mesa_glinterop_export_in *in,
-                                mesa_glinterop_export_out *out);
+                                struct mesa_glinterop_export_in *in,
+                                struct mesa_glinterop_export_out *out);
 };
 
 /**
diff --git a/src/glx/glxcmds.c b/src/glx/glxcmds.c
index 39b0fccc58..38b9059458 100644
--- a/src/glx/glxcmds.c
+++ b/src/glx/glxcmds.c
@@ -2697,7 +2697,7 @@ __glXGetUST(int64_t * ust)
 
 int
 MesaGLInteropGLXQueryDeviceInfo(Display *dpy, GLXContext context,
-                                mesa_glinterop_device_info *out)
+                                struct mesa_glinterop_device_info *out)
 {
    struct glx_context *gc = (struct glx_context*)context;
    int ret;
@@ -2721,8 +2721,8 @@ MesaGLInteropGLXQueryDeviceInfo(Display *dpy, GLXContext context,
 
 int
 MesaGLInteropGLXExportObject(Display *dpy, GLXContext context,
-                             mesa_glinterop_export_in *in,
-                             mesa_glinterop_export_out *out)
+                             struct mesa_glinterop_export_in *in,
+                             struct mesa_glinterop_export_out *out)
 {
    struct glx_context *gc = (struct glx_context*)context;
    int ret;