[glib] tidy up gthreadprivate.h

[Ryan Lortie <ryanl src gnome org>]

commit b1cc2579c199c6568e1bf5cef1aab7633f99824f
Author: Ryan Lortie <desrt desrt ca>
Date:   Thu Oct 13 01:22:51 2011 -0400

    tidy up gthreadprivate.h
    
    Remove some unused includes, too.

 glib/deprecated/gthread-deprecated.c |    1 +
 glib/gthreadprivate.h                |   40 ++++++++++++++-------------------
 2 files changed, 18 insertions(+), 23 deletions(-)
---
diff --git a/glib/deprecated/gthread-deprecated.c b/glib/deprecated/gthread-deprecated.c
index c6aa3ef..a669e50 100644
--- a/glib/deprecated/gthread-deprecated.c
+++ b/glib/deprecated/gthread-deprecated.c
@@ -32,6 +32,7 @@
 #include "gthread.h"
 #include "gthreadprivate.h"
 #include "deprecated/gthread.h"
+#include "garray.h"
 
 #include "gutils.h"
 
diff --git a/glib/gthreadprivate.h b/glib/gthreadprivate.h
index 4d7dd7c..3670b2f 100644
--- a/glib/gthreadprivate.h
+++ b/glib/gthreadprivate.h
@@ -24,13 +24,19 @@
 #define __G_THREADPRIVATE_H__
 
 #include "deprecated/gthread.h"
-#include "garray.h"
-#include "gslist.h"
-
-G_BEGIN_DECLS
 
 typedef struct _GRealThread GRealThread;
+struct  _GRealThread
+{
+  GThread thread;
 
+  gint ref_count;
+  gboolean ours;
+  const gchar *name;
+  gpointer retval;
+};
+
+/* system thread implementation (gthread-posix.c, gthread-win32.c) */
 G_GNUC_INTERNAL
 void            g_system_thread_wait            (GRealThread  *thread);
 
@@ -41,9 +47,13 @@ GRealThread *   g_system_thread_new             (GThreadFunc   func,
 G_GNUC_INTERNAL
 void            g_system_thread_free            (GRealThread  *thread);
 
-G_GNUC_INTERNAL void     g_system_thread_exit  (void);
-G_GNUC_INTERNAL void     g_system_thread_set_name (const gchar *name);
+G_GNUC_INTERNAL
+void            g_system_thread_exit            (void);
+G_GNUC_INTERNAL
+void            g_system_thread_set_name        (const gchar  *name);
+
 
+/* gthread.c */
 G_GNUC_INTERNAL
 GThread *       g_thread_new_internal           (const gchar  *name,
                                                  GThreadFunc   proxy,
@@ -53,22 +63,6 @@ GThread *       g_thread_new_internal           (const gchar  *name,
                                                  GError      **error);
 
 G_GNUC_INTERNAL
-gpointer        g_thread_proxy                  (gpointer     thread);
-
-struct  _GRealThread
-{
-  GThread thread;
-
-  gint ref_count;
-  gboolean ours;
-  const gchar *name;
-  gpointer retval;
-};
-
-#ifdef G_OS_WIN32
-G_GNUC_INTERNAL void g_thread_DllMain (void);
-#endif
-
-G_END_DECLS
+gpointer        g_thread_proxy                  (gpointer      thread);
 
 #endif /* __G_THREADPRIVATE_H__ */