MT#55283 compile fix for older glib

by moving the glib helper into containers.h Change-Id: I09bba2343cbbbaf4f9aba7fc89740d4fa6280927
1 year ago · 03212c28ef
parent 1f4c0d875e
commit 03212c28ef
2 changed files with 7 additions and 7 deletions
--- a/lib/auxlib.h
+++ b/lib/auxlib.h
@ -440,13 +440,6 @@ INLINE gboolean g_hash_table_steal_extended(GHashTable *ht, gconstpointer lookup
 }
 #endif

-#if !(GLIB_CHECK_VERSION(2,60,0))
-INLINE void g_queue_clear_full(GQueue *q, GDestroyNotify free_func) {
-	void *p;
-	while ((p = g_queue_pop_head(q)))
-		free_func(p);
-}
-#endif


 /*** MISC ***/
--- a/lib/containers.h
+++ b/lib/containers.h
@ -5,6 +5,13 @@
 #include <glib.h>
 #include <assert.h>

+#if !(GLIB_CHECK_VERSION(2,60,0))
+static inline void g_queue_clear_full(GQueue *q, GDestroyNotify free_func) {
+	void *p;
+	while ((p = g_queue_pop_head(q)))
+		free_func(p);
+}
+#endif

 #define TYPED_GHASHTABLE_PROTO(type_name, key_type, value_type) \
 	typedef union { \