From 46da153548d6e43a9d8b866812041e766e00b544 Mon Sep 17 00:00:00 2001
From: Bilal Elmoussaoui <belmouss@redhat.com>
Date: Wed, 29 Nov 2023 12:07:36 +0100
Subject: [PATCH] cogl: Various g-i fixes

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3431>
---
 cogl/cogl/cogl-types.h              | 5 ++++-
 cogl/cogl/deprecated/cogl-clutter.h | 1 -
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/cogl/cogl/cogl-types.h b/cogl/cogl/cogl-types.h
index 533f18464..221598187 100644
--- a/cogl/cogl/cogl-types.h
+++ b/cogl/cogl/cogl-types.h
@@ -63,6 +63,7 @@ G_BEGIN_DECLS
 #define COGL_PRIVATE(x) private_member_ ## x
 #endif
 
+#ifndef __GI_SCANNER__
 /* To help catch accidental changes to public structs that should
  * be stack allocated we use this macro to compile time assert that
  * a struct size is as expected.
@@ -72,7 +73,9 @@ typedef struct { \
           char compile_time_assert_ ## TYPE ## _size[ \
               (sizeof (TYPE) == (SIZE)) ? 1 : -1]; \
         } _ ## TYPE ## SizeCheck
-
+#else
+#define COGL_STRUCT_SIZE_ASSERT(TYPE, SIZE)
+#endif
 
 typedef struct _CoglFramebuffer CoglFramebuffer;
 
diff --git a/cogl/cogl/deprecated/cogl-clutter.h b/cogl/cogl/deprecated/cogl-clutter.h
index 0dbf74a37..604ad3f3a 100644
--- a/cogl/cogl/deprecated/cogl-clutter.h
+++ b/cogl/cogl/deprecated/cogl-clutter.h
@@ -34,7 +34,6 @@
 
 G_BEGIN_DECLS
 
-#define cogl_clutter_winsys_has_feature cogl_clutter_winsys_has_feature_CLUTTER
 COGL_DEPRECATED_FOR (cogl_has_feature)
 COGL_EXPORT gboolean
 cogl_clutter_winsys_has_feature (CoglWinsysFeature feature);