Move GTrashStack out of gutils.[hc]

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

diff --git a/glib/gthread.h b/glib/gthread.h
index 22fe973..fc927da 100644 (file)
--- a/glib/gthread.h
+++ b/glib/gthread.h
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
@@ -86,6 +86,7 @@ struct _GRecMutex
 #define G_PRIVATE_INIT(notify) { NULL, (notify), { NULL, NULL } }
 struct _GPrivate
 {
+  /*< private >*/
   gpointer       p;
   GDestroyNotify notify;
   gpointer future[2];
@@ -136,16 +137,14 @@ struct _GOnce
 #  define G_TRYLOCK(name) g_mutex_trylock (&G_LOCK_NAME (name))
 #endif /* !G_DEBUG_LOCKS */
 
+GThread *       g_thread_ref                    (GThread        *thread);
+void            g_thread_unref                  (GThread        *thread);
 GThread *       g_thread_new                    (const gchar    *name,
                                                  GThreadFunc     func,
-                                                 gpointer        data,
-                                                 gboolean        joinable,
-                                                 GError        **error);
-GThread *       g_thread_new_full               (const gchar    *name,
+                                                 gpointer        data);
+GThread *       g_thread_try_new                (const gchar    *name,
                                                  GThreadFunc     func,
                                                  gpointer        data,
-                                                 gboolean        joinable,
-                                                 gsize           stack_size,
                                                  GError        **error);
 GThread *       g_thread_self                   (void);
 void            g_thread_exit                   (gpointer        retval);
@@ -180,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,