Move GTrashStack out of gutils.[hc]

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

diff --git a/glib/gthread.h b/glib/gthread.h
index 6400f69..fc927da 100644 (file)
--- a/glib/gthread.h
+++ b/glib/gthread.h
@@ -142,15 +142,10 @@ 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);
-GThread *       g_thread_new_full               (const gchar    *name,
-                                                 GThreadFunc     func,
-                                                 gpointer        data,
-                                                 gsize           stack_size,
-                                                 GError        **error);
 GThread *       g_thread_self                   (void);
 void            g_thread_exit                   (gpointer        retval);
 gpointer        g_thread_join                   (GThread        *thread);
@@ -184,12 +179,9 @@ void            g_cond_wait                     (GCond          *cond,
                                                  GMutex         *mutex);
 void            g_cond_signal                   (GCond          *cond);
 void            g_cond_broadcast                (GCond          *cond);
-gboolean        g_cond_timed_wait               (GCond          *cond,
-                                                 GMutex         *mutex,
-                                                 GTimeVal       *timeval);
-gboolean        g_cond_timedwait                (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,