summaryrefslogtreecommitdiff
path: root/glib/gasyncqueue.h
diff options
context:
space:
mode:
authorDan Winship <danw@gnome.org>2012-02-08 08:26:36 -0500
committerDan Winship <danw@gnome.org>2012-02-13 09:09:08 -0500
commitdd553a2ba32cd8523e3097d34228c21b96a3f10c (patch)
treef325c5bea4f98f32938512c004db1bbfd713cf09 /glib/gasyncqueue.h
parent99af65a079e4d7c0c20960a6e68f83b3c56f6f20 (diff)
downloadglib-dd553a2ba32cd8523e3097d34228c21b96a3f10c.tar.gz
gasyncqueue: deprecate GTimeVal-based methods, add relative-delay ones
https://bugzilla.gnome.org/show_bug.cgi?id=669670
Diffstat (limited to 'glib/gasyncqueue.h')
-rw-r--r--glib/gasyncqueue.h15
1 files changed, 11 insertions, 4 deletions
diff --git a/glib/gasyncqueue.h b/glib/gasyncqueue.h
index e8fd0bfe6..f0d6d959a 100644
--- a/glib/gasyncqueue.h
+++ b/glib/gasyncqueue.h
@@ -66,10 +66,10 @@ gpointer g_async_queue_pop (GAsyncQueue *queue);
gpointer g_async_queue_pop_unlocked (GAsyncQueue *queue);
gpointer g_async_queue_try_pop (GAsyncQueue *queue);
gpointer g_async_queue_try_pop_unlocked (GAsyncQueue *queue);
-gpointer g_async_queue_timed_pop (GAsyncQueue *queue,
- GTimeVal *end_time);
-gpointer g_async_queue_timed_pop_unlocked (GAsyncQueue *queue,
- GTimeVal *end_time);
+gpointer g_async_queue_timeout_pop (GAsyncQueue *queue,
+ guint64 timeout);
+gpointer g_async_queue_timeout_pop_unlocked (GAsyncQueue *queue,
+ guint64 timeout);
gint g_async_queue_length (GAsyncQueue *queue);
gint g_async_queue_length_unlocked (GAsyncQueue *queue);
void g_async_queue_sort (GAsyncQueue *queue,
@@ -79,6 +79,13 @@ void g_async_queue_sort_unlocked (GAsyncQueue *queue,
GCompareDataFunc func,
gpointer user_data);
+GLIB_DEPRECATED_FOR(g_async_queue_timeout_pop)
+gpointer g_async_queue_timed_pop (GAsyncQueue *queue,
+ GTimeVal *end_time);
+GLIB_DEPRECATED_FOR(g_async_queue_timeout_pop_unlocked)
+gpointer g_async_queue_timed_pop_unlocked (GAsyncQueue *queue,
+ GTimeVal *end_time);
+
G_END_DECLS
#endif /* __G_ASYNCQUEUE_H__ */