Move GTrashStack out of gutils.[hc]

[platform/upstream/glib.git] / glib / gthread.h

diff --git a/glib/gthread.h b/glib/gthread.h
index c3b0f0c..fc927da 100644 (file)
--- a/glib/gthread.h
+++ b/glib/gthread.h
@@ -142,7 +142,7 @@ void            g_thread_unref                  (GThread        *thread);
 GThread *       g_thread_new                    (const gchar    *name,
                                                  GThreadFunc     func,
                                                  gpointer        data);
-GThread *       g_thread_try                    (const gchar    *name,
+GThread *       g_thread_try_new                (const gchar    *name,
                                                  GThreadFunc     func,
                                                  gpointer        data,
                                                  GError        **error);
@@ -181,7 +181,7 @@ void            g_cond_signal                   (GCond          *cond);
 void            g_cond_broadcast                (GCond          *cond);
 gboolean        g_cond_wait_until               (GCond          *cond,
                                                  GMutex         *mutex,
-                                                 gint64          abs_time);
+                                                 gint64          end_time);
 
 gpointer        g_private_get                   (GPrivate       *key);
 void            g_private_set                   (GPrivate       *key,