apply patch in tree

diff --git a/common-src/glib-util.c b/common-src/glib-util.c
index 91985e500f4efa670c7ee69116af001ae4761a65..6a42e8e2b4324900cb7f433080f3c2bf733975e8 100644 (file)
--- a/common-src/glib-util.c
+++ b/common-src/glib-util.c
@@ -120,15 +120,6 @@ void slist_free_full(GSList * list, GDestroyNotify free_fn) {
 }
 #endif
 
-void g_queue_free_full(GQueue * queue) {
-    while (!g_queue_is_empty(queue)) {
-        gpointer data;
-        data = g_queue_pop_head(queue);
-        amfree(data);
-    }
-    g_queue_free(queue);
-}
-
 void g_ptr_array_free_full(GPtrArray * array) {
     size_t i;
 

diff --git a/common-src/glib-util.h b/common-src/glib-util.h
index f687fcd0529f5c08afadfd5f81bbe6b9713c6c54..70d0e12ac1d4bfa32086a2ddb576d425af93e1e7 100644 (file)
--- a/common-src/glib-util.h
+++ b/common-src/glib-util.h
@@ -72,7 +72,6 @@ void slist_free_full(GSList * list, GDestroyNotify free_fn);
 
 /* These functions all take a GLib container, and call free() on all the
  * pointers in the container before free()ing the container itself. */
-void g_queue_free_full(GQueue * queue);
 void g_ptr_array_free_full(GPtrArray * array);
 
 /* g_value_compare() does what you expect. It returns TRUE if and