Merge branch 'wip/smcv/redundant-type-assertions' into 'main'

Revert "glib-init: Add more static assertions for gintptr, guintptr" See merge request GNOME/glib!3263

Merge branch 'wip/smcv/redundant-type-assertions' into 'main'
d5bf03cb · Philip Withnall · 816b35df · 73c91ef7 · d5bf03cb
Commit d5bf03cb authored 2 years ago by Philip Withnall
--- a/glib/glib-init.c
+++ b/glib/glib-init.c
@@ -141,9 +141,6 @@ G_STATIC_ASSERT (sizeof (gintptr) == sizeof (intptr_t));
 G_STATIC_ASSERT (sizeof (guintptr) == sizeof (uintptr_t));
 G_STATIC_ASSERT (G_ALIGNOF (gintptr) == G_ALIGNOF (intptr_t));
 G_STATIC_ASSERT (G_ALIGNOF (guintptr) == G_ALIGNOF (uintptr_t));
-/* True by definition */
-G_STATIC_ASSERT (sizeof (gintptr) >= sizeof (void *));
-G_STATIC_ASSERT (sizeof (guintptr) >= sizeof (void *));

 G_STATIC_ASSERT (sizeof (gint8) == sizeof (int8_t));
 G_STATIC_ASSERT (sizeof (guint8) == sizeof (uint8_t));